mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-22 05:30:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from gambhiro/relative-paths

Browse Source 
conditional relative paths
This commit is contained in:
Matt Feemster 2016-01-02 10:10:40 -08:00
commit fd084d2ce8
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/QtCreator/Ember/Ember.pro
View File

@ -60,7 +60,7 @@ HEADERS += \
$$PRJ_DIR/Variations05.h \ $$PRJ_DIR/Variations05.h \
$$PRJ_DIR/Variations06.h \ $$PRJ_DIR/Variations06.h \
$$PRJ_DIR/VariationsDC.h \ $$PRJ_DIR/VariationsDC.h \
$$PRJ_DIR/VarFuncs.h \ $$PRJ_DIR/VarFuncs.h \
$$PRJ_DIR/Xform.h \ $$PRJ_DIR/Xform.h \
$$PRJ_DIR/XmlToEmber.h $$PRJ_DIR/XmlToEmber.h

14
Builds/QtCreator/defaults.pri
View File

@ -1,7 +1,6 @@
VERSION = 0.9.9.2 VERSION = 0.9.9.2
# When this file is included: message(PWD: $$(PWD))
# - $$(PWD) is the project folder, e.g. ./Builds/QtCreator/Ember/
# TODO: win32 install dirs? # TODO: win32 install dirs?
@ -11,7 +10,16 @@ unix|macx {
SHARE_INSTALL_DIR = /usr/share/fractorium 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_DIR = $$EMBER_ROOT/Source
SRC_COMMON_DIR = $$EMBER_ROOT/Source/EmberCommon SRC_COMMON_DIR = $$EMBER_ROOT/Source/EmberCommon
ASSETS_DIR = $$EMBER_ROOT/Data ASSETS_DIR = $$EMBER_ROOT/Data

0
Builds/create-symlinks.sh Normal file → Executable file
View File

3
main.pro
View File

@ -1,5 +1,8 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
CONFIG += autobuild
# message(PWD: $$(PWD))
LOCAL_LIB_DIR = $$(PWD)/Builds/lib LOCAL_LIB_DIR = $$(PWD)/Builds/lib
LOCAL_INCLUDE_DIR = $$(PWD)/Builds/include LOCAL_INCLUDE_DIR = $$(PWD)/Builds/include