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

opengl-headers 1.2 in vendor folder

Browse Source
This commit is contained in:
Gambhiro
2015-12-16 14:54:14 +00:00
parent ea261c4c5e
commit eaf802c562
20 changed files with 16131 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Builds/QtCreator/defaults.pri
View File

@ -1,8 +1,7 @@
VERSION = 0.9.9.2
# When this file is included:
# - $$(PWD) is ./Builds/QtCreator/
# - $(PWD) is the project folder, e.g. ./Builds/QtCreator/Ember/
# - $$(PWD) is the project folder, e.g. ./Builds/QtCreator/Ember/
# TODO: win32 install dirs?
@ -24,8 +23,8 @@ CONFIG(debug, debug|release) {
SRC_DIR = $$(PWD)/../../../Source
SRC_COMMON_DIR = $$(PWD)/../../../Source/EmberCommon
ASSETS_DIR = $$(PWD)/../../../Data
LOCAL_LIB_DIR = $$(PWD)/../../../lib
LOCAL_INCLUDE_DIR = $$(PWD)/../../../include
LOCAL_LIB_DIR = $$(PWD)/../../lib
LOCAL_INCLUDE_DIR = $$(PWD)/../../include
macx {
LIBS += -framework OpenGL
@ -35,7 +34,6 @@ macx {
LIBS += -L/usr/local/lib
INCLUDEPATH += /usr/local/include
INCLUDEPATH += $$(PWD)/../../../Deps
QMAKE_MAC_SDK = macosx10.11
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
@ -87,9 +85,13 @@ CMAKE_CXXFLAGS += -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
INCLUDEPATH += /usr/include
INCLUDEPATH += /usr/local/include
INCLUDEPATH += $$LOCAL_INCLUDE_DIR/vendor
INCLUDEPATH += $$LOCAL_INCLUDE_DIR
# Using a local version of opencl-headers, to make sure version 1.2.
#INCLUDEPATH += /usr/include/CL
#INCLUDEPATH += /usr/local/include/CL
INCLUDEPATH += /usr/include/CL
INCLUDEPATH += /usr/local/include/CL
INCLUDEPATH += /usr/include/GL
INCLUDEPATH += /usr/local/include/GL