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 /config/win32-mingw-config.py | |
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 'config/win32-mingw-config.py')
-rw-r--r-- | config/win32-mingw-config.py | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 6a4aed6503f..78c48ef95e1 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -1,5 +1,12 @@ LCGDIR = '#../lib/windows' -BF_PYTHON = LCGDIR + '/python' +LIBDIR = "${LCGDIR}" + +BF_VERSE = "#extern/verse/dist" +BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist" +BF_VERSE_INCLUDE = BF_VERSE +BF_VERSE_LIBS = "libverse" + +BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '2.4' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' @@ -7,74 +14,73 @@ BF_PYTHON_LIB = 'python24' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = 'true' -BF_OPENAL = LCGDIR + '/openal' +BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = 'false' -BF_FFMPEG = LCGDIR + '/gcc/ffmpeg' BF_FFMPEG_LIB = 'avformat avutil avcodec' -BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib' -BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' +BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' WITH_BF_SDL = 'true' -BF_SDL = LCGDIR + '/sdl' +BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' BF_SDL_LIB = 'SDL' BF_SDL_LIBPATH = '${BF_SDL}/lib' -BF_PTHREADS = LCGDIR + '/pthreads' +BF_PTHREADS = LIBDIR + '/pthreads' BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadGC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' WITH_BF_FMOD = 'false' -BF_FMOD = LCGDIR + '/fmod' +BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'true' -BF_OPENEXR = LCGDIR + '/gcc/openexr' +BF_OPENEXR = LIBDIR + '/gcc/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Half IlmImf Iex ' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' WITH_BF_JPEG = 'true' -BF_JPEG = LCGDIR + '/jpeg' +BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'jpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' WITH_BF_PNG = 'true' -BF_PNG = LCGDIR + '/png' +BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' BF_PNG_LIBPATH = '${BF_PNG}/lib' -BF_TIFF = LCGDIR + '/tiff' +BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' WITH_BF_ZLIB = 'true' -BF_ZLIB = LCGDIR + '/zlib' +BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' #BF_ZLIB_LIB = 'z' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' WITH_BF_INTERNATIONAL = 'true' -BF_GETTEXT = LCGDIR + '/gettext' +BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' WITH_BF_FTGL = 'true' -BF_FTGL = LCGDIR + '/ftgl' +BF_FTGL = LIBDIR + '/ftgl' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' WITH_BF_GAMEENGINE = 'false' WITH_BF_ODE = 'true' -BF_ODE = LCGDIR + '/ode' +BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' @@ -88,14 +94,14 @@ BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' #WITH_BF_NSPR = 'true' -#BF_NSPR = $(LCGDIR)/nspr +#BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = # Uncomment the following line to use Mozilla inplace of netscape #CPPFLAGS += -DMOZ_NOT_NET # Location of MOZILLA/Netscape header files... -#BF_MOZILLA = $(LCGDIR)/mozilla +#BF_MOZILLA = $(LIBDIR)/mozilla #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl #BF_MOZILLA_LIB = # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB @@ -105,7 +111,7 @@ BF_SOLID_LIB = 'extern_solid' #BF_PARANOID = 'true' # enable freetype2 support for text objects -BF_FREETYPE = LCGDIR + '/gcc/freetype' +BF_FREETYPE = LIBDIR + '/gcc/freetype' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' |