mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-02-23 13:31:31 -05:00
Manual merge for default.pri
This commit is contained in:
parent
c43e3708b6
commit
1dc363d190
@ -11,6 +11,13 @@ unix|macx {
|
||||
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 += warn_off
|
||||
DESTDIR = $$(PWD)/../../../Bin/release
|
||||
@ -20,12 +27,6 @@ CONFIG(debug, debug|release) {
|
||||
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 {
|
||||
LIBS += -framework OpenGL
|
||||
LIBS += -framework OpenCL
|
||||
@ -51,13 +52,6 @@ macx {
|
||||
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 {
|
||||
QMAKE_CXXFLAGS += -march=native
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user