diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-02-24 20:34:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-02-24 20:34:41 +0300 |
| commit | 56e9c87309e155d6710067759c415279848b6bea (patch) | |
| tree | 7b87f7c318ce2947f02edb85d40e62a5b6c68173 | |
| parent | adaa4b0fd0c7dde64b9610b68188052d4d8a628c (diff) | |
building the game engine without SDL works again
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index fb67c855b81..a7e4d8807b2 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -28,6 +28,8 @@ if env['WITH_BF_QUICKTIME']: if env['WITH_BF_SDL']: incs += ' ' + env['BF_SDL_INC'] +else: + defs += ' DISABLE_SDL' if env['WITH_BF_INTERNATIONAL']: defs += ' WITH_FREETYPE2' diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index e9e68f14df8..40cbc35e7f3 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -4,6 +4,7 @@ import sys Import ('env') sources = env.Glob('*.cpp') +defs = '' # Mathutils C files. sources.extend([\ @@ -41,10 +42,12 @@ incs += ' ' + env['BF_OPENGL_INC'] if env['WITH_BF_SDL']: incs += ' ' + env['BF_SDL_INC'] - +else: + defs += ' DISABLE_SDL' + cxxflags = [] if env['OURPLATFORM']=='win32-vc': cxxflags.append ('/GR') cxxflags.append ('/O2') -env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], cxx_compileflags = cxxflags ) +env.BlenderLib ( 'bf_ketsji', sources, Split(incs), Split(defs), libtype=['game','player'], priority=[25, 72], cxx_compileflags = cxxflags ) |