summaryrefslogtreecommitdiffstats
path: root/process
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-04-19 11:07:15 +0200
committerPierre Rossi <pierre.rossi@digia.com>2013-04-29 14:05:05 +0200
commit3300873bba24594e4773d0e0a127d33a5a0f303c (patch)
treef780ce65de01b46635d08c0c5d61615ac6da9130 /process
parent5067310342ac2d2b7004ed7d036bda6e3015f7d7 (diff)
New qmake approach
This should allow us to have much better integration by generating the necessary gyp files directly from qmake. Mostly works for now, though we will most likely need to build the gyp generation as we go. * Out dir logic is still crap and needs to be (re)worked. * In the same vein, we probably don't want the generated gyp content ending up in the source tree in the long run, which could prove tricky with relative paths to sources and all.
Diffstat (limited to 'process')
-rw-r--r--process/process.gyp14
-rw-r--r--process/process.pro11
2 files changed, 11 insertions, 14 deletions
diff --git a/process/process.gyp b/process/process.gyp
deleted file mode 100644
index c055c2e9f..000000000
--- a/process/process.gyp
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'blinq_process',
- 'type': 'executable',
- 'includes': [
- '../blinq.gypi',
- ],
- 'sources': [
- 'main.cpp',
- ],
- },
- ],
-}
diff --git a/process/process.pro b/process/process.pro
new file mode 100644
index 000000000..efb517a5f
--- /dev/null
+++ b/process/process.pro
@@ -0,0 +1,11 @@
+# This is a dummy .pro file used to extract some aspects of the used configuration and feed them to gyp
+# We want the gyp generation step to happen after all the other config steps. For that we need to prepend
+# our gypi_gen.prf feature to the CONFIG variable since it is processed backwards
+CONFIG = gypi_gen $$CONFIG
+
+TARGET = blinq_process
+TEMPLATE = app
+
+QT -= gui core
+
+SOURCES = main.cpp