diff --git a/Builds/QtCreator/Ember/Ember.pro b/Builds/QtCreator/Ember/Ember.pro index f7e1b17..e783f5a 100644 --- a/Builds/QtCreator/Ember/Ember.pro +++ b/Builds/QtCreator/Ember/Ember.pro @@ -60,7 +60,7 @@ HEADERS += \ $$PRJ_DIR/Variations05.h \ $$PRJ_DIR/Variations06.h \ $$PRJ_DIR/VariationsDC.h \ - $$PRJ_DIR/VarFuncs.h \ + $$PRJ_DIR/VarFuncs.h \ $$PRJ_DIR/Xform.h \ $$PRJ_DIR/XmlToEmber.h diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 481b880..77861cd 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -1,7 +1,6 @@ VERSION = 0.9.9.2 -# When this file is included: -# - $$(PWD) is the project folder, e.g. ./Builds/QtCreator/Ember/ +message(PWD: $$(PWD)) # TODO: win32 install dirs? @@ -11,7 +10,16 @@ unix|macx { SHARE_INSTALL_DIR = /usr/share/fractorium } -EMBER_ROOT = ./../../../ +# When loaded by QtCreator +EMBER_ROOT = $$(PWD)/../../.. + +# When compiling from project root +autobuild { + EMBER_ROOT = $$(PWD)/../.. +} + +message(EMBER_ROOT: $$EMBER_ROOT) + SRC_DIR = $$EMBER_ROOT/Source SRC_COMMON_DIR = $$EMBER_ROOT/Source/EmberCommon ASSETS_DIR = $$EMBER_ROOT/Data diff --git a/Builds/create-symlinks.sh b/Builds/create-symlinks.sh old mode 100644 new mode 100755 diff --git a/main.pro b/main.pro index 77a754a..1a6a1f4 100644 --- a/main.pro +++ b/main.pro @@ -1,5 +1,8 @@ TEMPLATE = subdirs CONFIG += ordered +CONFIG += autobuild + +# message(PWD: $$(PWD)) LOCAL_LIB_DIR = $$(PWD)/Builds/lib LOCAL_INCLUDE_DIR = $$(PWD)/Builds/include