- Added the SConscripts for ftfont and quicktime
- [win32] python_include was missing, there was a double python_libpath. Corrected - [win32] the soundsystem SConscript broke the win32 build.
This commit is contained in:
parent
a017282b62
commit
a66108134c
|
@ -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'
|
||||
|
|
|
@ -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']
|
||||
|
|
|
@ -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)
|
|
@ -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)
|
Loading…
Reference in New Issue