Fix bug in Windows build; examples use include.pri to source library …

…(PROPMAN-18)
parallaxinc · Dec 3, 2015 · 82bbf85 · 82bbf85
1 parent 64e80ee
commit 82bbf85
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 20 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@ install:
     - qmake -v
 
 build_script:
-    - qmake PREFIX=$(get-location)/%PROJECTNAME% -r
+    - qmake PREFIX=%cd%/%PROJECTNAME% -r
     - mingw32-make
     - mingw32-make install
     - jar -cMf %PROJECTNAME%.zip %PROJECTNAME%

diff --git a/common.pri b/common.pri
@@ -21,4 +21,4 @@ TOP_PWD = $$PWD
     error("PropellerIDE requires Qt5.2 or greater")
 }
 
-message(common.pri: $$TOP_PWD)
+#message(common.pri: $$TOP_PWD)
diff --git a/example/examples.pri b/example/examples.pri
diff --git a/example/download/.gitignore → examples/download/.gitignore b/example/download/.gitignore → examples/download/.gitignore
diff --git a/example/download/download.pro → examples/download/download.pro b/example/download/download.pro → examples/download/download.pro
diff --git a/example/download/main.cpp → examples/download/main.cpp b/example/download/main.cpp → examples/download/main.cpp
diff --git a/examples/examples.pri b/examples/examples.pri
@@ -0,0 +1,5 @@
+include(../common.pri)
+include(../include.pri)
+
+TEMPLATE = app
+CONFIG += console
diff --git a/example/examples.pro → examples/examples.pro b/example/examples.pro → examples/examples.pro
diff --git a/example/identify/.gitignore → examples/identify/.gitignore b/example/identify/.gitignore → examples/identify/.gitignore
diff --git a/example/identify/identify.pro → examples/identify/identify.pro b/example/identify/identify.pro → examples/identify/identify.pro
diff --git a/example/identify/main.cpp → examples/identify/main.cpp b/example/identify/main.cpp → examples/identify/main.cpp
diff --git a/example/imageinfo/.gitignore → examples/imageinfo/.gitignore b/example/imageinfo/.gitignore → examples/imageinfo/.gitignore
diff --git a/example/imageinfo/imageinfo.pro → examples/imageinfo/imageinfo.pro b/example/imageinfo/imageinfo.pro → examples/imageinfo/imageinfo.pro
diff --git a/example/imageinfo/main.cpp → examples/imageinfo/main.cpp b/example/imageinfo/main.cpp → examples/imageinfo/main.cpp
diff --git a/example/portmonitor/.gitignore → examples/portmonitor/.gitignore b/example/portmonitor/.gitignore → examples/portmonitor/.gitignore
diff --git a/example/portmonitor/main.cpp → examples/portmonitor/main.cpp b/example/portmonitor/main.cpp → examples/portmonitor/main.cpp
diff --git a/example/portmonitor/portmonitor.h → examples/portmonitor/portmonitor.h b/example/portmonitor/portmonitor.h → examples/portmonitor/portmonitor.h
diff --git a/example/portmonitor/portmonitor.pro → examples/portmonitor/portmonitor.pro b/example/portmonitor/portmonitor.pro → examples/portmonitor/portmonitor.pro
diff --git a/example/terminal/.gitignore → examples/terminal/.gitignore b/example/terminal/.gitignore → examples/terminal/.gitignore
diff --git a/example/terminal/main.cpp → examples/terminal/main.cpp b/example/terminal/main.cpp → examples/terminal/main.cpp
diff --git a/example/terminal/terminal.pro → examples/terminal/terminal.pro b/example/terminal/terminal.pro → examples/terminal/terminal.pro
diff --git a/include.pri b/include.pri
@@ -9,4 +9,4 @@ win32-msvc* {
 	PRE_TARGETDEPS += $$TOP_PWD/lib/libpropellermanager.a
 }
 
-message(include.pri: $$TOP_PWD)
+#message(include.pri: $$TOP_PWD)
diff --git a/include/include.pro b/include/include.pro
@@ -3,5 +3,6 @@ include(../common.pri)
 TEMPLATE = aux
 
 target.path   = $$PREFIX/include
-target.files  = $$files($$TOP_PWD/include/*)
+target.files  += $$files($$TOP_PWD/include/*)
+target.files  -= $$TOP_PWD/include/include.pro
 INSTALLS += target