Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure cleanup #1010

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions mythplugins/configure
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ flix
"

CONFIG_LIST="
opengl
exif
newexif
dcraw
Expand Down Expand Up @@ -609,8 +608,6 @@ ECXXFLAGS=$(cat mythconfig.mak | grep -e "^ECXXFLAGS=")
ECXXFLAGS=${ECXXFLAGS#ECXXFLAGS=}
CXXPPFLAGS=$(cat mythconfig.mak | grep -e "^CXXPPFLAGS=")
CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
WEBKIT=$(cat mythconfig.mak | grep -e "^CONFIG_QTWEBKIT=yes")

EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
Expand Down Expand Up @@ -640,11 +637,6 @@ qmake=${qmake#QMAKE=}
qt_version_str=`$qmake -query QT_VERSION`
qt_version=$(version2num $qt_version_str)

# rely on what was discover during MythTV configure
if enabled opengl && test "$OPENGLV" != "CONFIG_OPENGL_VIDEO=yes"; then
disable opengl
fi

if ! check_lib libexif/exif-data.h exif_loader_new -lexif ; then
disable exif
fi
Expand Down
5 changes: 0 additions & 5 deletions mythplugins/settings.pro
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ macx:CONFIG += console
# figure out compile flags based on qmake info

QMAKE_CXXFLAGS += $$ARCHFLAGS
QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
QMAKE_CXXFLAGS += $$CXXFLAGS $$ECXXFLAGS

Expand Down Expand Up @@ -69,12 +68,8 @@ contains(CONFIG_LIBMP3LAME, "yes") {
EXTRA_LIBS += $$CONFIG_AUDIO_ALSA_LIBS
EXTRA_LIBS += $$CONFIG_AUDIO_JACK_LIBS
EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
EXTRA_LIBS += $$CONFIG_DIRECTFB_LIBS

EXTRA_LIBS += $$LOCAL_LIBDIR_X11
EXTRA_LIBS += $$CONFIG_XV_LIBS
EXTRA_LIBS += $$CONFIG_XVMC_LIBS
EXTRA_LIBS += $$CONFIG_OPENGL_VSYNC_LIBS

LIRC_LIBS = $$CONFIG_LIRC_LIBS

Expand Down
Loading
Loading