diff --git a/build.sh b/build.sh index c80254b..949c782 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ if [[ $unamestr == "Darwin" ]]; then #export QMAKESPEC=macx-xcode PATH=$PATH:/Users/aalex/Qt5.2.1/5.2.1/clang_64/bin qmake5=/Users/aalex/Qt5.2.1/5.2.1/clang_64/bin/qmake - $qmake5 + $qmake5 -spec macx-llvm elif [[ $unamestr == "Linux" ]]; then qmake-qt4 fi diff --git a/mapmap.pro b/mapmap.pro index bc98a73..0fe998c 100644 --- a/mapmap.pro +++ b/mapmap.pro @@ -95,14 +95,13 @@ mac { LIBS += \ -framework OpenGL \ -framework GLUT - # -L/opt/local/lib \ QMAKE_CXXFLAGS += -D__MACOSX_CORE__ QMAKE_CXXFLAGS += -stdlib=libstdc++ INCLUDEPATH += /Library/Frameworks/GStreamer.framework/Headers - LIBS+=-L/opt/local/lib -lavformat -lavcodec -lavutil -lswscale -lz - LIBS+=-framework GStreamer - QMAKE_LFLAGS+=-read_only_relocs suppress + # LIBS+=-lavformat -lavcodec -lavutil -lswscale -lz + LIBS += -F /Library/Frameworks/ -framework GStreamer + # QMAKE_LFLAGS+=-read_only_relocs suppress # LIBS += -lgstreamer-0.10 \ # -lgstapp-0.10 \