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 | |
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')
-rw-r--r-- | config/darwin-config.py | 29 | ||||
-rw-r--r-- | config/linux2-config.py | 15 | ||||
-rw-r--r-- | config/linuxcross-config.py | 37 | ||||
-rw-r--r-- | config/openbsd3-config.py | 12 | ||||
-rw-r--r-- | config/sunos5-config.py | 10 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 44 | ||||
-rw-r--r-- | config/win32-vc-config.py | 45 |
7 files changed, 115 insertions, 77 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 36f2949af53..d0f89376270 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -1,4 +1,11 @@ LCGDIR = '#../lib/darwin-6.1-powerpc' +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 = '/System/Library/Frameworks/Python.framework/Versions/' BF_PYTHON_VERSION = '2.3' BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}' @@ -8,19 +15,19 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERS BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python' WITH_BF_OPENAL = 'true' -BF_OPENAL = LCGDIR + '/openal' +BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_SDL = 'true' -BF_SDL = LCGDIR + '/sdl' #$(shell sdl-config --prefix) +BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer BF_SDL_LIBPATH = '${BF_SDL}/lib' WITH_BF_FMOD = 'false' -BF_FMOD = LCGDIR + '/fmod' +BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'true' BF_OPENEXR = '/usr/local' @@ -29,18 +36,18 @@ BF_OPENEXR_LIB = ' Iex Half IlmImf Imath ' 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' @@ -50,7 +57,7 @@ BF_ZLIB_LIB = 'z' WITH_BF_INTERNATIONAL = 'true' -BF_GETTEXT = LCGDIR + '/gettext' +BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' @@ -64,7 +71,7 @@ WITH_BF_GAMEENGINE='true' WITH_BF_PLAYER='true' WITH_BF_ODE = 'false' -BF_ODE = LCGDIR + '/ode' +BF_ODE = LIBDIR + '/ode' BF_ODE_INC = '${BF_ODE}/include' BF_ODE_LIB = '${BF_ODE}/lib/libode.a' @@ -78,14 +85,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 @@ -95,7 +102,7 @@ BF_SOLID_LIB = 'extern_solid' #BF_PARANOID = 'true' # enable freetype2 support for text objects -BF_FREETYPE = LCGDIR + '/freetype' +BF_FREETYPE = LIBDIR + '/freetype' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' diff --git a/config/linux2-config.py b/config/linux2-config.py index 91568dc4588..4c8886982bc 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -1,4 +1,11 @@ LCGDIR = '../lib/linux2' +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 = '/usr' BF_PYTHON_VERSION = '2.4' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' @@ -17,7 +24,7 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer WITH_BF_FMOD = 'false' -BF_FMOD = LCGDIR + '/fmod' +BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'true' BF_OPENEXR = '/usr' @@ -57,7 +64,7 @@ BF_FTGL_LIB = 'extern_ftgl' WITH_BF_GAMEENGINE='true' WITH_BF_ODE = 'false' -BF_ODE = LCGDIR + '/ode' +BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' @@ -71,14 +78,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 diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 247d4630926..67cdd3e51f1 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -1,5 +1,12 @@ -LCGDIR = '#../lib/windows' -BF_PYTHON = LCGDIR + '/python' +LCGDIR = '../lib/windows' +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,68 +14,68 @@ 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_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' @@ -82,7 +89,7 @@ BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' # 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' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 2d1d92da2f2..abeb9186bb8 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -1,4 +1,6 @@ LCGDIR = '../lib/openbsd3' +LIBDIR = '${LCGDIR}' + BF_PYTHON = '/usr/local' BF_PYTHON_VERSION = '2.3' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' @@ -7,7 +9,7 @@ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config' WITH_BF_OPENAL = 'false' -#BF_OPENAL = LCGDIR + '/openal' +#BF_OPENAL = LIBDIR + '/openal' #BF_OPENAL_INC = '${BF_OPENAL}/include' #BF_OPENAL_LIB = 'openal' #BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' @@ -19,7 +21,7 @@ BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer BF_SDL_LIBPATH = '${BF_SDL}/lib' WITH_BF_FMOD = 'false' -BF_FMOD = LCGDIR + '/fmod' +BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'false' BF_OPENEXR = '/usr/local' @@ -61,7 +63,7 @@ BF_FTGL_LIB = 'extern_ftgl' WITH_BF_GAMEENGINE='true' WITH_BF_ODE = 'false' -BF_ODE = LCGDIR + '/ode' +BF_ODE = LIBDIR + '/ode' BF_ODE_INC = '${BF_ODE}/include' BF_ODE_LIB = '${BF_ODE}/lib/libode.a' @@ -75,14 +77,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 diff --git a/config/sunos5-config.py b/config/sunos5-config.py index cf84a68e490..436217c1be1 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -1,4 +1,6 @@ LCGDIR = '../lib/sunos5' +LIBDIR = '${LCGDIR}' + BF_PYTHON = '/usr/local' BF_PYTHON_VERSION = '2.4' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' @@ -19,7 +21,7 @@ BF_SDL_LIBPATH = '${BF_SDL}/lib' BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer WITH_BF_FMOD = 'false' -BF_FMOD = LCGDIR + '/fmod' +BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'true' BF_OPENEXR = '/usr/local' @@ -63,7 +65,7 @@ BF_FTGL_LIB = 'extern_ftgl' WITH_BF_GAMEENGINE='true' WITH_BF_ODE = 'false' -BF_ODE = LCGDIR + '/ode' +BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' @@ -77,14 +79,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 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' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 0a9a1262264..ea9ac55681a 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-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,74 @@ 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}/include/AL ' BF_OPENAL_LIB = 'openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_ICONV = 'true' -BF_ICONV = LCGDIR + '/iconv' +BF_ICONV = LIBDIR + '/iconv' BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' WITH_BF_SDL = 'true' -BF_SDL = LCGDIR + '/sdl' +BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' BF_SDL_LIB = 'SDL.lib' BF_SDL_LIBPATH = '${BF_SDL}/lib' -BF_PTHREADS = LCGDIR + '/pthreads' +BF_PTHREADS = LIBDIR + '/pthreads' BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadVC2' 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 + '/openexr' +BF_OPENEXR = LIBDIR + '/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath ' BF_OPENEXR_LIB = ' Iex Half IlmImf Imath ' -BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' +BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc' WITH_BF_JPEG = 'true' -BF_JPEG = LCGDIR + '/jpeg' +BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'libjpeg' 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 = 'libpng_st' 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 = 'libz' 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 = 'true' 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 +95,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,13 +112,13 @@ BF_SOLID_LIB = 'extern_solid' #BF_PARANOID = 'true' # enable freetype2 support for text objects -BF_FREETYPE = LCGDIR + '/freetype' +BF_FREETYPE = LIBDIR + '/freetype' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype2ST' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME -BF_QUICKTIME = LCGDIR + '/QTDevWin' +BF_QUICKTIME = LIBDIR + '/QTDevWin' BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes' BF_QUICKTIME_LIB = 'qtmlClient' BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries' |