Merge branch 'master' of github.com:cpvrlab/ImagePlay

cpvrlab · Mar 5, 2015 · e1cfeb7 · e1cfeb7
2 parents 60d4dee + f6aba4a
commit e1cfeb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/IPL/IPL.pro b/IPL/IPL.pro
@@ -236,16 +236,16 @@ macx: {
 linux: {
     CONFIG +=c++11
 
-   # LIBS += -L$$PWD/../_lib/freeimage/ -lfreeimage-3.16.0
+    LIBS += -lfreeimage
 
     INCLUDEPATH += $$PWD/../_lib/freeimage
     DEPENDPATH += $$PWD/../_lib/freeimage
 
     DESTDIR = ../_bin/$$CONFIGURATION/$$PLATFORM/lib/
 
-   # LIBS += -L$$PWD/../_lib/opencv/x64/clang/lib/ -lopencv_core
-   # LIBS += -L$$PWD/../_lib/opencv/x64/clang/lib/ -lopencv_imgproc
-   # LIBS += -L$$PWD/../_lib/opencv/x64/clang/lib/ -lopencv_highgui
+    LIBS += -lopencv_core
+    LIBS += -lopencv_imgproc
+    LIBS += -lopencv_highgui
 
 }
 

diff --git a/ImagePlay/ImagePlay.pro b/ImagePlay/ImagePlay.pro
@@ -152,10 +152,9 @@ win32: {
     resources.files += ../_res/process_icons
     INSTALLS += resources
 }
+
 macx: {
-    QMAKE_CXXFLAGS += -stdlib=libstdc++ -std=c++11
     CONFIG +=c++11
-
     LIBS += -L../_bin/$$CONFIGURATION/$$PLATFORM/ImagePlay.app/Contents/Frameworks/ -lIPL
 
     mylib.path = Contents/Frameworks
@@ -185,6 +184,12 @@ macx: {
 
 }
 
+linux: {
+    CONFIG +=c++11
+    LIBS += -L../_bin/$$CONFIGURATION/$$PLATFORM/lib/ -lIPL
+}
+
+
 INCLUDEPATH += $$PWD/include/
 INCLUDEPATH += $$PWD/../IPL/include/
 INCLUDEPATH += $$PWD/../IPL/include/processes/