diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-08-22 17:04:07 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-08-22 17:04:07 +0400 |
| commit | 7fd8ce8156fcada505c73f5fb7af4b8ced755a3e (patch) | |
| tree | ffdff3e1b4526ad4a5a885db1a5b2fd52d710952 /SConstruct | |
| parent | f21f3cb290e221e4b4610e43c17e9702b43a1cb5 (diff) | |
* Patch #4909 by Joseph Eagar (joeedh)
- this patch adds verse support for SCons, which can be enabled by
giving WITH_BF_VERSE=1, ie. on command-line
- this patch also adds a custom lib dir possibility. From the patch description:
"To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py."
* Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/SConstruct b/SConstruct index bc1dd8e47aa..df318a526fa 100644 --- a/SConstruct +++ b/SConstruct @@ -205,9 +205,9 @@ if env['OURPLATFORM'] == 'linux2' : os.rmdir(root) if len(B.quickdebug) > 0 and printdebug != 0: - print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC - for l in B.quickdebug: - print "\t" + l + print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC + for l in B.quickdebug: + print "\t" + l # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline if 'blenderplayer' in B.targets: @@ -355,18 +355,18 @@ textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist) allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): - dllsources = ['#../lib/windows/gettext/lib/gnu_gettext.dll', - '#../lib/windows/png/lib/libpng.dll', - '#../lib/windows/python/lib/python24.dll', + dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', + '${LCGDIR}/png/lib/libpng.dll', + '${LCGDIR}/python/lib/python24.dll', '#release/windows/extra/python24.zip', '#release/windows/extra/zlib.pyd', - '#../lib/windows/sdl/lib/SDL.dll', - '#../lib/windows/zlib/lib/zlib.dll', - '#../lib/windows/tiff/lib/libtiff.dll'] + '${LCGDIR}/sdl/lib/SDL.dll', + '${LCGDIR}/zlib/lib/zlib.dll', + '${LCGDIR}/tiff/lib/libtiff.dll'] if env['OURPLATFORM'] == 'win32-mingw': - dllsources += ['#../lib/windows/pthreads/lib/pthreadGC2.dll'] + dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll'] else: - dllsources += ['#../lib/windows/pthreads/lib/pthreadVC2.dll'] + dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll'] windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) allinstall += windlls |