diff options
author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
---|---|---|
committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
commit | a68a7f42b02ad0260220d94f36ab61c772db071a (patch) | |
tree | 620b763cd24fbfc1259f00ccb005217914af0c6f /config | |
parent | 526d0bec4722900a86d81ff0f5d71504b2b4ad8c (diff) | |
parent | 15215493bf9d1d08e650109e6eb6189fc76e289e (diff) |
resolved conflict state with HEAD r14096
blenderbuttons still bad
not let this compile
Diffstat (limited to 'config')
-rw-r--r-- | config/darwin-config.py | 2 | ||||
-rw-r--r-- | config/linux2-config.py | 17 | ||||
-rw-r--r-- | config/linuxcross-config.py | 2 | ||||
-rw-r--r-- | config/openbsd3-config.py | 2 | ||||
-rw-r--r-- | config/sunos5-config.py | 2 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 28 | ||||
-rw-r--r-- | config/win32-vc-config.py | 12 |
7 files changed, 39 insertions, 26 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 1071adb222f..df4b3235136 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -54,6 +54,8 @@ BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' +WITH_BF_DDS = 'true' + WITH_BF_JPEG = 'true' BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' diff --git a/config/linux2-config.py b/config/linux2-config.py index a041f518ba7..4d8b5c97512 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -29,8 +29,14 @@ BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'true' BF_OPENEXR = '/usr' +# when compiling with your own openexr lib you might need to set... +# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include' + BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' +# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' + +WITH_BF_DDS = 'true' WITH_BF_JPEG = 'true' BF_JPEG = '/usr' @@ -112,12 +118,17 @@ BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' +WITH_BF_BINRELOC = 'true' + # enable ffmpeg support -WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG -BF_FFMPEG = '/usr' +WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG +BF_FFMPEG = '#extern/ffmpeg' +BF_FFMPEG_LIB = '' +# Uncomment the following two lines to use system's ffmpeg +# BF_FFMPEG = '/usr' +# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat avcodec avutil' # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 1c2288a8430..e6c4e8769b4 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -39,6 +39,8 @@ BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Half IlmImf Iex ' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' +WITH_BF_DDS = 'true' + WITH_BF_JPEG = 'true' BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index b3579d4ac65..f7f254973af 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -28,6 +28,8 @@ BF_OPENEXR = '/usr/local' BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' +WITH_BF_DDS = 'true' + WITH_BF_JPEG = 'true' BF_JPEG = '/usr/local' BF_JPEG_INC = '${BF_JPEG}/include' diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 7939e210993..b3ca0e267ff 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -29,6 +29,8 @@ BF_OPENEXR_INC = ['${BF_OPENEXR}/include', '${BF_OPENEXR}/include/OpenEXR' ] BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' +WITH_BF_DDS = 'true' + WITH_BF_JPEG = 'true' BF_JPEG = '/usr/local' BF_JPEG_INC = '${BF_JPEG}/include' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 95c096c4bac..d9fd6ce8d4f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -14,11 +14,11 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = 'true' BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' -BF_OPENAL_LIB = 'openal_static' +BF_OPENAL_LIB = 'dxguid openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = 'false' -BF_FFMPEG_LIB = 'avformat avutil avcodec' +BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264' BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' @@ -42,6 +42,8 @@ BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Half IlmImf Iex ' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' +WITH_BF_DDS = 'true' + WITH_BF_JPEG = 'true' BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' @@ -60,7 +62,6 @@ BF_TIFF_INC = '${BF_TIFF}/include' WITH_BF_ZLIB = 'true' BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' -#BF_ZLIB_LIB = 'z' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' WITH_BF_INTERNATIONAL = 'true' @@ -109,9 +110,6 @@ WITH_BF_YAFRAY = 'true' #BF_MOZILLA_LIB = # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB # if this is not set. -# -# Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' # enable freetype2 support for text objects BF_FREETYPE = LIBDIR + '/gcc/freetype' @@ -141,8 +139,6 @@ BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a' ## CC = 'gcc' CXX = 'g++' -##ifeq ($CPU),alpha) -## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] @@ -150,24 +146,18 @@ CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ] CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ] REL_CFLAGS = [ '-O2' ] REL_CCFLAGS = [ '-O2' ] -##BF_DEPEND = 'true' -## -##AR = ar -##ARFLAGS = ruv -##ARFLAGSQUIET = ru -## + C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ] CC_WARN = [ '-Wall' ] -##FIX_STUBS_WARNINGS = -Wno-unused - -LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread'] -##LOPTS = --dynamic -##DYNLDFLAGS = -shared $(LDFLAGS) +LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++'] BF_DEBUG = 'false' BF_DEBUG_FLAGS= '-g' +BF_PROFILE_FLAGS = ['-pg','-g'] +BF_PROFILE = 'false' + BF_BUILDDIR = '..\\build\\win32-mingw' BF_INSTALLDIR='..\\install\\win32-mingw' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 7e0d98c072b..1b75f981a37 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -21,7 +21,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = 'true' BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' -BF_OPENAL_LIB = 'openal_static' +BF_OPENAL_LIB = 'dxguid openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_ICONV = 'true' @@ -50,6 +50,8 @@ BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEX BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread ' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc' +WITH_BF_DDS = 'true' + WITH_BF_JPEG = 'true' BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' @@ -104,6 +106,8 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' WITH_BF_YAFRAY = 'true' +WITH_BF_BINRELOC = 'false' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr @@ -145,15 +149,15 @@ CXX = 'cl.exe' CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', '/Gd', '/MT'] -BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET.base}.sbr'] +BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr'] -CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DUSE_OPENAL', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE'] +CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE'] REL_CFLAGS = ['-O2', '-DNDEBUG'] REL_CCFLAGS = ['-O2', '-DNDEBUG'] C_WARN = [] CC_WARN = [] -LLIBS = 'ws2_32 dxguid vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid' +LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid' PLATFORM_LINKFLAGS = ''' /SUBSYSTEM:CONSOLE |