From 4c768bfd1c16ec541bb1a51b63601ede9e727be1 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 18 May 2014 17:49:27 +0100 Subject: [PATCH] Cleanup --- data/macos/build.sh | 31 +++++++------------------------ data/macos/env-vars.sh | 13 +++++++------ source/Makefile.mk | 4 ++-- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/data/macos/build.sh b/data/macos/build.sh index 80da131e7..e04df6fb8 100755 --- a/data/macos/build.sh +++ b/data/macos/build.sh @@ -15,27 +15,19 @@ if [ -d /dev/shm ]; then export PATH=/usr/i686-apple-darwin10/bin/:$PATH else # MacOS - export CC="gcc-mp-4.7" - export CXX="g++-mp-4.7" - export LDFLAGS="-L/usr/local/lib/" - export PYUIC="pyuic4-3.3" - export PYRCC="pyrcc4-3.3 -py3" + . ./data/macos/env-vars.sh fi -./configure -prefix /Users/falktx/Source/Qt-5.2.1 -release -opensource -confirm-license -no-c++11 -no-javascript-jit -no-qml-debug -force-pkg-config -qt-zlib -no-mtdev -no-gif -qt-libpng -qt-libjpeg -qt-freetype -no-openssl -qt-pcre -no-xinput2 -no-xcb-xlib -no-glib -no-cups -no-iconv -no-icu -no-fontconfig -no-dbus -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms -no-compile-examples -nomake examples -nomake tests -make tools -make libs -qt-sql-sqlite -no-framework -no-sql-odbc +# ./configure -prefix /Users/falktx/Source/Qt-5.2.1 -release -opensource -confirm-license -no-c++11 +# -no-javascript-jit -no-qml-debug -force-pkg-config -qt-zlib -no-mtdev -no-gif -qt-libpng -qt-libjpeg -qt-freetype -no-openssl -qt-pcre +# -no-xinput2 -no-xcb-xlib -no-glib -no-cups -no-iconv -no-icu -no-fontconfig -no-dbus -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms +# -no-compile-examples -nomake examples -nomake tests -make tools -make libs -qt-sql-sqlite -no-framework -no-sql-odbc # Clean build make clean -# Build PyQt4 resources -# make $JOBS UI RES WIDGETS - -# Build discovery -# make $JOBS -C source/discovery MACOS=true - -# Build backend -# make $JOBS -C source/backend/standalone ../libcarla_standalone.dylib EXTRA_LIBS="-ldl" MACOS=true -# DGL_LIBS="-framework OpenGL -framework Cocoa" HAVE_OPENGL=true +# Build +make $JOBS HAVE_FFMPEG=false HAVE_GTK2=false HAVE_GTK3=false # rm -rf ./data/macos/build @@ -50,14 +42,5 @@ make clean # cp ../../source/backend/*.dylib build/backend/ # cp ../../source/discovery/carla-discovery-* build/discovery/ -# cp $WINEPREFIX/drive_c/windows/syswow64/python33.dll Carla/ -# cp $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/QtCore4.dll Carla/ -# cp $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/QtGui4.dll Carla/ -# cp $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/QtOpenGL4.dll Carla/ -# cp $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/QtSvg4.dll Carla/ -# cp $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/QtXml4.dll Carla/ -# cp -r $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/plugins/imageformats/ Carla/ -# cp -r $WINEPREFIX/drive_c/Python33/Lib/site-packages/PyQt4/plugins/iconengines/ Carla/ - # cd ../.. diff --git a/data/macos/env-vars.sh b/data/macos/env-vars.sh index aebdca5fb..a4d077efe 100755 --- a/data/macos/env-vars.sh +++ b/data/macos/env-vars.sh @@ -1,9 +1,10 @@ #!/bin/bash export MACOS="true" -#export CC="gcc-4.2" -#export CXX="g++-4.2" -#export CXXFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5" -export PYUIC="/opt/local/Library/Frameworks/Python.framework/Versions/3.3/bin/pyuic5" -export PYRCC="/opt/local/Library/Frameworks/Python.framework/Versions/3.3/bin/pyrcc5" -export PKG_CONFIG_PATH="/Users/falktx/Source/Qt5/5.2.1/clang_64/lib/pkgconfig" +export CC="gcc-4.2" +export CXX="g++-4.2" +export CXXFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5" +export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig + +export PYRCC="pyrcc4-3.3 -py3" +export PYUIC="pyuic4-3.3 -w" diff --git a/source/Makefile.mk b/source/Makefile.mk index 2c2b2abf5..18d135423 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -192,11 +192,13 @@ endif # -------------------------------------------------------------- # Check for optional libs (required by backend or bridges) +ifneq ($(MACOS_OR_WIN32),true) HAVE_FFMPEG = $(shell pkg-config --exists libavcodec libavformat libavutil && echo true) HAVE_GTK2 = $(shell pkg-config --exists gtk+-2.0 && echo true) HAVE_GTK3 = $(shell pkg-config --exists gtk+-3.0 && echo true) HAVE_WAYLAND = $(shell pkg-config --exists wayland-client && echo true) HAVE_X11 = $(shell pkg-config --exists x11 && echo true) +endif ifeq ($(LINUX),true) HAVE_ALSA = $(shell pkg-config --exists alsa && echo true) @@ -228,8 +230,6 @@ HAVE_ZYN_UI_DEPS = $(shell pkg-config --exists ntk_images ntk && echo true) ifeq ($(MACOS_OR_WIN32),true) CARLA_VESTIGE_HEADER = false -HAVE_WAYLAND = false -HAVE_X11 = false endif # --------------------------------------------------------------