mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-23 13:31:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manual merge for default.pri

Browse Source
This commit is contained in:
mfeemster 2015-12-31 13:55:24 -08:00
parent c43e3708b6
commit 1dc363d190
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Builds/QtCreator/defaults.pri
View File

@ -11,6 +11,13 @@ unix|macx {
SHARE_INSTALL_DIR = /usr/share/fractorium SHARE_INSTALL_DIR = /usr/share/fractorium
} }
EMBER_ROOT = ./../../../
SRC_DIR = $$EMBER_ROOT/Source
SRC_COMMON_DIR = $$EMBER_ROOT/Source/EmberCommon
ASSETS_DIR = $$EMBER_ROOT/Data
LOCAL_LIB_DIR = $$(PWD)/../../lib
LOCAL_INCLUDE_DIR = $$(PWD)/../../include
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
CONFIG += warn_off CONFIG += warn_off
DESTDIR = $$(PWD)/../../../Bin/release DESTDIR = $$(PWD)/../../../Bin/release
@ -20,12 +27,6 @@ CONFIG(debug, debug|release) {
DESTDIR = $$(PWD)/../../../Bin/debug DESTDIR = $$(PWD)/../../../Bin/debug
} }
SRC_DIR = $$(PWD)/../../../Source
SRC_COMMON_DIR = $$(PWD)/../../../Source/EmberCommon
ASSETS_DIR = $$(PWD)/../../../Data
LOCAL_LIB_DIR = $$(PWD)/../../lib
LOCAL_INCLUDE_DIR = $$(PWD)/../../include
macx { macx {
LIBS += -framework OpenGL LIBS += -framework OpenGL
LIBS += -framework OpenCL LIBS += -framework OpenCL
@ -51,13 +52,6 @@ macx {
QMAKE_LFLAGS_RELEASE += -s QMAKE_LFLAGS_RELEASE += -s
} }
# The NVIDIA def was used to force OpenCL 1.1.
# The Linux drivers support OpenCL 1.2 now.
#nvidia {
# QMAKE_CXXFLAGS += -DNVIDIA
#}
native { native {
QMAKE_CXXFLAGS += -march=native QMAKE_CXXFLAGS += -march=native
} else { } else {