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

Merge branch 'master' of https://github.com/mfeemster/fractorium.git

Browse Source
This commit is contained in:
mfeemster 2016-01-04 16:51:23 -08:00
commit a8688e87b5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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