- Added the SConscripts for ftfont and quicktime
authorNathan Letwory <nathan@letworyinteractive.com>
Mon, 5 Jan 2004 18:17:23 +0000 (18:17 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Mon, 5 Jan 2004 18:17:23 +0000 (18:17 +0000)
- [win32] python_include was missing, there was a double python_libpath. Corrected
- [win32] the soundsystem SConscript broke the win32 build.

SConstruct
intern/SoundSystem/SConscript
source/blender/ftfont/SConscript [new file with mode: 0644]
source/blender/quicktime/SConscript [new file with mode: 0644]

index 3b8527f7c77adfbececeb8b49b6ee7ca1052c0e9..3742f9482f686cb01dc74b4def2bc485ed0c1be1 100644 (file)
@@ -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'
index ce9ab8c188231ead1fc8a500140120b3d4f13e5d..d6d872139622662ec9a145a8c195ef11985c7d62 100644 (file)
@@ -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 (file)
index 0000000..ef359be
--- /dev/null
@@ -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 (file)
index 0000000..bcc1792
--- /dev/null
@@ -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)