diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | intern/SoundSystem/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/ftfont/SConscript | 23 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 27 |
4 files changed, 56 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 3b8527f7c77..3742f9482f6 100644 --- a/SConstruct +++ b/SConstruct @@ -119,6 +119,7 @@ elif sys.platform == 'win32': cxxflags = [] defines = ['WIN32', 'NDEBUG', '_CONSOLE', 'FTGL_STATIC_LIBRARY'] defines += ['GAME_BLENDER=0', 'INTERNATIONAL', 'WITH_QUICKTIME'] + defines += ['_LIB', 'WITH_FREETYPE2'] warn_flags = [] platform_libs = ['SDL', 'freetype2ST', 'ftgl_static_ST', 'gnu_gettext', 'qtmlClient', 'odelib', 'openal_static', 'soundsystem', @@ -170,9 +171,10 @@ elif sys.platform == 'win32': sdl_cflags = '' window_system = 'WIN32' # Python lib name - python_libpath = '#../lib/windows/python/include' + python_include = '#../lib/windows/python/include/python2.2' python_libpath = '#../lib/windows/python/lib' python_lib = 'python22' + link_env.Append (CPPDEFINES = defines) elif string.find (sys.platform, 'sunos') != -1: window_system = 'X11' diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index ce9ab8c1882..d6d87213962 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -13,7 +13,6 @@ Import ('extra_includes') soundsys_env.Append (CCFLAGS = cflags) soundsys_env.Append (CXXFLAGS = cxxflags) -soundsys_env.Append (CPPDEFINES = defines) source_files = ['dummy/SND_DummyDevice.cpp', 'intern/SND_AudioDevice.cpp', @@ -39,7 +38,9 @@ if use_openal == 'true': source_files += ['openal/SND_OpenALDevice.cpp', 'openal/pthread_cancel.cpp'] if sys.platform=='win32': - cflags += ' /D_LIB' + defines += ['_LIB'] + soundsys_env.Append(CPPDEFINES = defines) + if use_fmod == 'true': source_files += ['fmod/SND_FmodDevice.cpp'] diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript new file mode 100644 index 00000000000..ef359bebd46 --- /dev/null +++ b/source/blender/ftfont/SConscript @@ -0,0 +1,23 @@ +# Import the C flags set in the SConstruct file +Import ('cflags') +Import ('cxxflags') +Import ('extra_includes') +Import ('defines') + +source_files = ['intern/FTF_Api.cpp', + 'intern/FTF_TTFont.cpp'] + +include_paths = ['.', + 'intern', + '../blenlib', + '../makesdna'] + +print defines + +ftf_env = Environment() +ftf_env.Append(CPPPATH = extra_includes) +ftf_env.Append(CPPPATH = include_paths) +ftf_env.Append(CCFLAGS = cflags) +ftf_env.Append(CXXFLAGS = cxxflags) +ftf_env.Append(CPPDEFINES = defines) +ftf_env.Library (target='#/lib/blender_FTF', source=source_files) diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript new file mode 100644 index 00000000000..bcc1792d586 --- /dev/null +++ b/source/blender/quicktime/SConscript @@ -0,0 +1,27 @@ +quicktime_env = Environment () + +# Import the C flags set in the SConstruct file +Import ('cflags') +Import ('cxxflags') +Import ('extra_includes') +Import ('defines') +quicktime_env.Append (CCFLAGS = cflags) +quicktime_env.Append (CXXFLAGS = cxxflags) +quicktime_env.Append (CPPPATH = extra_includes) +quicktime_env.Append (CPPDEFINES = defines) + +source_files = ['apple/quicktime_import.c', + 'apple/quicktime_export.c'] + +quicktime_env.Append (CPPPATH = ['.', + '../makesdna', + '#/intern/guardedalloc', + '../blenlib', + '../blenkernel', + '../avi', + '../imbuf', + '../imbuf/intern', + '../readstreamglue', + '../render/extern/include']) + +quicktime_env.Library (target='#/lib/blender_quicktime', source=source_files) |