diff --git a/appveyor.yml b/appveyor.yml index c652d4d..b9191d2 100644 --- 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 index 95bbc7f..e1c4225 100644 --- 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 deleted file mode 100644 index 15d20ae..0000000 --- a/example/examples.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT += serialport - -TEMPLATE = app - -CONFIG += console -CONFIG -= app_bundle debug_and_release - -INCLUDEPATH += ../../include/ -LIBS += -L ../../lib/ -lpropellermanager - -win32-msvc* { - PRE_TARGETDEPS += ../../lib/propellermanager.lib -} else { - PRE_TARGETDEPS += ../../lib/libpropellermanager.a -} - diff --git a/example/download/.gitignore b/examples/download/.gitignore similarity index 100% rename from example/download/.gitignore rename to examples/download/.gitignore diff --git a/example/download/download.pro b/examples/download/download.pro similarity index 100% rename from example/download/download.pro rename to examples/download/download.pro diff --git a/example/download/main.cpp b/examples/download/main.cpp similarity index 100% rename from example/download/main.cpp rename to examples/download/main.cpp diff --git a/examples/examples.pri b/examples/examples.pri new file mode 100644 index 0000000..a4bfcca --- /dev/null +++ b/examples/examples.pri @@ -0,0 +1,5 @@ +include(../common.pri) +include(../include.pri) + +TEMPLATE = app +CONFIG += console diff --git a/example/examples.pro b/examples/examples.pro similarity index 100% rename from example/examples.pro rename to examples/examples.pro diff --git a/example/identify/.gitignore b/examples/identify/.gitignore similarity index 100% rename from example/identify/.gitignore rename to examples/identify/.gitignore diff --git a/example/identify/identify.pro b/examples/identify/identify.pro similarity index 100% rename from example/identify/identify.pro rename to examples/identify/identify.pro diff --git a/example/identify/main.cpp b/examples/identify/main.cpp similarity index 100% rename from example/identify/main.cpp rename to examples/identify/main.cpp diff --git a/example/imageinfo/.gitignore b/examples/imageinfo/.gitignore similarity index 100% rename from example/imageinfo/.gitignore rename to examples/imageinfo/.gitignore diff --git a/example/imageinfo/imageinfo.pro b/examples/imageinfo/imageinfo.pro similarity index 100% rename from example/imageinfo/imageinfo.pro rename to examples/imageinfo/imageinfo.pro diff --git a/example/imageinfo/main.cpp b/examples/imageinfo/main.cpp similarity index 100% rename from example/imageinfo/main.cpp rename to examples/imageinfo/main.cpp diff --git a/example/portmonitor/.gitignore b/examples/portmonitor/.gitignore similarity index 100% rename from example/portmonitor/.gitignore rename to examples/portmonitor/.gitignore diff --git a/example/portmonitor/main.cpp b/examples/portmonitor/main.cpp similarity index 100% rename from example/portmonitor/main.cpp rename to examples/portmonitor/main.cpp diff --git a/example/portmonitor/portmonitor.h b/examples/portmonitor/portmonitor.h similarity index 100% rename from example/portmonitor/portmonitor.h rename to examples/portmonitor/portmonitor.h diff --git a/example/portmonitor/portmonitor.pro b/examples/portmonitor/portmonitor.pro similarity index 100% rename from example/portmonitor/portmonitor.pro rename to examples/portmonitor/portmonitor.pro diff --git a/example/terminal/.gitignore b/examples/terminal/.gitignore similarity index 100% rename from example/terminal/.gitignore rename to examples/terminal/.gitignore diff --git a/example/terminal/main.cpp b/examples/terminal/main.cpp similarity index 100% rename from example/terminal/main.cpp rename to examples/terminal/main.cpp diff --git a/example/terminal/terminal.pro b/examples/terminal/terminal.pro similarity index 100% rename from example/terminal/terminal.pro rename to examples/terminal/terminal.pro diff --git a/include.pri b/include.pri index 08e68d1..c5d0fc3 100644 --- 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 index 24173b1..ba09072 100644 --- 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