update pro/pri files

zddhub · Feb 19, 2017 · ce8e259 · ce8e259
1 parent 47ec3dd
commit ce8e259
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/gui/SketchSearchDemo/SketchSearchDemo.pro b/gui/SketchSearchDemo/SketchSearchDemo.pro
@@ -36,7 +36,7 @@ CONFIGDIR = /tmp/SketchSearchDemo
 QMAKE_POST_LINK = mkdir -p $$CONFIGDIR; cp $$PWD/config.json $$CONFIGDIR; \
                   mkdir -p $$CONFIGDIR/view; cp $$PWD/view/* $$CONFIGDIR/view
 
-macx {
+unix {
 INCLUDEPATH += $$PWD \
     /usr/local/include
 
@@ -46,6 +46,8 @@ LIBS += -L/usr/local/lib/ \
             -lopensse
 }
 
+macx: CONFIG += app_bundle
+
 include(trimeshview/trimeshview.pri)
 
 SOURCES += main.cpp\
@@ -59,5 +61,3 @@ HEADERS  += mainwindow.h \
     searchengine.h \
     resultphotowidget.h \
     sketchsearcher.h \
-
-macx: CONFIG += app_bundle
diff --git a/opensse.pri b/opensse.pri
@@ -15,31 +15,19 @@
 # limitations under the License.
 #-------------------------------------------------------------------------
 
-unix:!macx {
-# I use Ubuntu
-INCLUDEPATH += $$PWD \
-    /usr/local/include
-
-LIBS += -L/usr/local/lib/ \
-    -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_features2d -lopencv_ml \
-    -lboost_thread -lboost_system
-
-}
-
-macx {
+unix {
 
 INCLUDEPATH += $$PWD \
     /usr/local/include
 
 LIBS += -L/usr/local/lib/ \
             -lopencv_core -lopencv_imgproc -lopencv_imgcodecs -lopencv_highgui -lopencv_features2d -lopencv_ml \
             -lboost_thread -lboost_system
+}
 
+macx: {
 #for commind line
 CONFIG -= app_bundle
-
-#change clang version for you mac
-#message("QMAKE_MAC_SDK:" $$QMAKE_MAC_SDK)
 }