diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-02-21 06:26:03 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-02-21 06:26:03 +0300 |
| commit | 994f915b3cdc497f3335f9cb474b1b5aac85c429 (patch) | |
| tree | 7e7d58bdaeeee3f8df0922260d498b2e625ae578 /SConstruct | |
| parent | 64dd45ef4371575f3090858cd3b4abbbabed3a2b (diff) | |
2.5 - Fixed compiling for scons + mingw
jesterKing: please check on this, since it seems to be basic typos only? See my mail to the list for details of the error.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 8fe9218ae2e..72acbf845d7 100644 --- a/SConstruct +++ b/SConstruct @@ -400,7 +400,8 @@ thestatlibs, thelibincs = B.setup_staticlibs(env) thesyslibs = B.setup_syslibs(env) if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: - env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') + #env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') + env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') @@ -552,7 +553,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'): if env['OURPLATFORM'] == 'win64-vc': dllsources = [] else: - dllsources = ['${LCGDIR}/gettext/lib/gettext.dll', + dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', '${BF_PNG_LIBPATH}/libpng.dll', '${BF_ZLIB_LIBPATH}/zlib.dll', '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll'] |