godotengine/godot-platform-haiku
1
0
Fork 0
mirror of https://github.com/godotengine/godot-platform-haiku.git synced 2026-01-05 10:10:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: godotengine:2.0.3-stable
Branches Tags
godotengine:master godotengine:3.2
godotengine:3.2-stable godotengine:3.2.1-stable godotengine:3.1.2-stable godotengine:2.1.6-stable godotengine:3.1-stable godotengine:3.1.1-stable godotengine:2.1.5-stable godotengine:3.0.5-stable godotengine:3.0-stable godotengine:3.0.1-stable godotengine:3.0.2-stable godotengine:3.0.3-stable godotengine:3.0.4-stable godotengine:3.0.6-stable godotengine:2.1.4-stable godotengine:2.1.3-stable godotengine:2.1.2-stable godotengine:2.1.1-stable godotengine:2.1-stable godotengine:2.0.4-stable godotengine:2.0.4.1-stable godotengine:2.0.2-stable godotengine:2.0.3-stable godotengine:2.0-stable godotengine:2.0.1-stable godotengine:1.1-stable godotengine:1.0-stable
..
compare: godotengine:2.0.4.1-stable
Branches Tags
godotengine:master godotengine:3.2
godotengine:3.2-stable godotengine:3.2.1-stable godotengine:3.1.2-stable godotengine:2.1.6-stable godotengine:3.1-stable godotengine:3.1.1-stable godotengine:2.1.5-stable godotengine:3.0.5-stable godotengine:3.0-stable godotengine:3.0.1-stable godotengine:3.0.2-stable godotengine:3.0.3-stable godotengine:3.0.4-stable godotengine:3.0.6-stable godotengine:2.1.4-stable godotengine:2.1.3-stable godotengine:2.1.2-stable godotengine:2.1.1-stable godotengine:2.1-stable godotengine:2.0.4-stable godotengine:2.0.4.1-stable godotengine:2.0.2-stable godotengine:2.0.3-stable godotengine:2.0-stable godotengine:2.0.1-stable godotengine:1.1-stable godotengine:1.0-stable

2 Commits
2.0.3-stab ... 2.0.4.1-st

Author SHA1 Message Date
Rémi Verschelde
753debf9e1 GLEW: Define static + enabled and includes via SCons 
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.

For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.

(cherry picked from commit 768e9252714b57421b5c893a8258469a14630a30)
 2016-06-25 00:24:09 +02:00
Rémi Verschelde
b035447dd1 Haiku: Do not define GLEW_ENABLED to undefine it later 
Partial revert of f61eb5fd8e13642c82364f8ee66a0f6c791a4511.

(cherry picked from commit 4c658dc52303ece088a245ede2835a68b78530b2)
 2016-06-25 00:24:02 +02:00
1 changed files with 4 additions and 3 deletions
Expand all files Collapse all files

7
detect.py
View File

@@ -23,7 +23,8 @@ def get_opts():
def get_flags(): def get_flags():
return [ return [
('builtin_zlib', 'no') ('builtin_zlib', 'no'),
#('glew', 'yes'), # TODO: investigate the GLEW situation on Haiku
] ]
def configure(env): def configure(env):
@@ -52,9 +53,9 @@ def configure(env):
#env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) #env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np
env.Append(CPPFLAGS = ['-DGLEW_ENABLED', '-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED']) env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL']) env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL', 'GLEW']) env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
import methods import methods
env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')}) env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})