diff options
| author | Michel Selten <michel@mselten.demon.nl> | 2004-03-15 22:55:11 +0300 |
|---|---|---|
| committer | Michel Selten <michel@mselten.demon.nl> | 2004-03-15 22:55:11 +0300 |
| commit | 90d179f014a6c47878e3bb225e3a6de97510ba72 (patch) | |
| tree | 988af1ecfddb765a788819c696214ed5810201fd /source/blender/makesdna/intern/SConscript | |
| parent | 127e57d983dcc2b3403f68443fd7f76ce1413a6a (diff) | |
SCons updates
* Added the following flags to config.opts:
- PYTHON_LINKFLAGS
- PLATFORM_LIBS
- PLATFORM_LIBPATH
- PLATFORM_LINKFLAGS
Backup your original config.opts file and run scons again to get these new
options.
* Use freetype-config instead of pkg-config for determining the freetype2
flags.
* The new PYTHON_LINKFLAGS now enable the dynamic linking on Linux and
possibly other platforms as well. This should resolve all linking problems
reported to the mailing lists. (At least for Linux, I can't test other
platforms).
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 85f339bc5fa..7d4520982d9 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -2,9 +2,6 @@ import sys # Import the C flags set in the SConstruct file Import ('cflags') Import ('defines') -Import ('platform_libs') -Import ('platform_libpath') -Import ('platform_linkflags') Import ('user_options_dict') if sys.platform=='win32': @@ -33,7 +30,7 @@ makesdna_tool.Replace (PATH = user_options_dict['PATH']) makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) -makesdna_tool.Append (LINKFLAGS = platform_linkflags) +makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS']) makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib') makesdna_tool.Append (LIBS = 'blender_guardedalloc') makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files) |