From 6f847863a131cc61addbe6485abf2f24ae150ff1 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 31 Jul 2009 02:35:56 +0000 Subject: setting WITH_BF_PLAYER = False as default to scons (temporary solution to avoid linking problem reports over and over and over and over ... again) I obviously couldn't test this in all OS. If there is any problem with this commit please fell free to fix/let me know. --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 8b152be437e..4df15c691c2 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -88,7 +88,7 @@ BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' WITH_BF_GAMEENGINE = True -WITH_BF_PLAYER = True +WITH_BF_PLAYER = False WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' -- cgit v1.2.3 From acd02148d84cf33c06fadd33b3af9d7d44d5974a Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Wed, 5 Aug 2009 14:10:29 +0000 Subject: Update for new OpenAL windows library. --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index c2f8e29e4c6..359f52e6bf8 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -22,7 +22,7 @@ WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' -BF_OPENAL_LIB = 'dxguid openal_static' +BF_OPENAL_LIB = 'wrap_oal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -- cgit v1.2.3 From 1e4fb484001994f4e164aab7b44c9578df59f67d Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 6 Aug 2009 08:23:07 +0000 Subject: * update windows default config for the openal updates, merging r22241 from soundsystem branch --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 4df15c691c2..30239579567 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -19,7 +19,7 @@ WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' -BF_OPENAL_LIB = 'dxguid openal_static' +BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -- cgit v1.2.3 From 9eff68a9e91f79b29dcbf133c5b626a9c54bfeb0 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 6 Aug 2009 13:01:24 +0000 Subject: * further cleanup of windows defaults for openal --- config/win32-vc-config.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 30239579567..c226a2dca18 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -16,13 +16,10 @@ BF_PYTHON_LIB = 'python31' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = True -WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' -BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static' +BF_OPENAL_LIB = 'OpenAL32 wrap_oal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' -# Warning, this static lib configuration is untested! users of this OS please confirm. -BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' # TODO - are these useful on win32? # BF_CXX = '/usr' -- cgit v1.2.3 From 054ed5a50b6b7396f70d1b5353d7ada36e14e19f Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Sun, 9 Aug 2009 10:55:25 +0000 Subject: Smoke: * WITH_BF_FFTW3 flag --> fftw3 scons + cmake settings refined. * Disabled by default since mac + win32 libs missing. Works already on win64 + linux (with installed fftw3 libs) --- config/win32-vc-config.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index c226a2dca18..4e2a735243a 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -133,6 +133,12 @@ BF_OPENJPEG_LIB = '' BF_OPENJPEG_INC = '${BF_OPENJPEG}' BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' +WITH_BF_FFTW3 = False +BF_FFTW3 = LIBDIR + '/fftw3' +BF_FFTW3_INC = '${BF_FFTW3}/include' +BF_FFTW3_LIB = 'libfftw' +BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' + WITH_BF_REDCODE = False BF_REDCODE_INC = '#extern' -- cgit v1.2.3 From 6c5c58e05799f2b593cd81fcff57e6ef72ad57fb Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Sun, 9 Aug 2009 21:16:39 +0000 Subject: 2.5: Sound branch merge! See mailing list for additional information. --- config/win32-vc-config.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 4e2a735243a..bb1bc02ccdb 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -17,8 +17,8 @@ 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 = 'OpenAL32 wrap_oal' +BF_OPENAL_INC = '${BF_OPENAL}/include ' +BF_OPENAL_LIB = 'wrap_oal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' # TODO - are these useful on win32? @@ -32,6 +32,11 @@ BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' +BF_LIBSAMPLERATE = LIBDIR + '/samplerate' +BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' +BF_LIBSAMPLERATE_LIB = 'libsamplerate' +BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib' + WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' -- cgit v1.2.3 From 1e0fd0d4c14824e856424000e1122dcb1c8b44dd Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 17 Aug 2009 01:16:50 +0000 Subject: == SCons == * add jack support for audio system. Note that for OSX jack support is still off by default, since I'm not sure about what goes where. OSX maintainers, please check and fix. --- config/win32-vc-config.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index bb1bc02ccdb..c1946e5f24e 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -37,6 +37,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' BF_LIBSAMPLERATE_LIB = 'libsamplerate' BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib' +WITH_BF_JACK = True +BF_JACK = LIBDIR + '/jack' +BF_JACK_INC = '${BF_JACK}/include' +BF_JACK_LIB = 'libjack' +BF_JACK_LIBPATH = '${BF_JACK}/lib' + WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' -- cgit v1.2.3 From d4d94618ee98111754a99dc20b15b3a47e7b3f25 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 17 Aug 2009 09:20:14 +0000 Subject: * Jack support should be off by default until things have been cleared up (see meeting notes 16.8.2009) --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index c1946e5f24e..e9bbd42e915 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -37,7 +37,7 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' BF_LIBSAMPLERATE_LIB = 'libsamplerate' BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib' -WITH_BF_JACK = True +WITH_BF_JACK = False BF_JACK = LIBDIR + '/jack' BF_JACK_INC = '${BF_JACK}/include' BF_JACK_LIB = 'libjack' -- cgit v1.2.3 From 5e9e6df2a24b28cbb8c1de293725ebe4af3f9a2d Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 24 Aug 2009 02:49:57 +0000 Subject: * changes to work with updated FFMPEG libs. Mainly build system. CMake files may need changing too. NOTE: remember to svn up in lib/windows! --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 359f52e6bf8..3ec76d464bc 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -7,7 +7,7 @@ BF_VERSE_INCLUDE = "#extern/verse/dist" # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' -BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib' -- cgit v1.2.3 From 4c8d32b4bf624bd70a4c2b20a9c971ae92e8f8a3 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 25 Aug 2009 10:56:01 +0000 Subject: == SCons == * Add sndfile support (False by default). Note: for this to work, make sure that FFMPEG-support is disabled. --- config/win32-vc-config.py | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 2c219633540..c50f41b6d4b 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -21,11 +21,6 @@ BF_OPENAL_INC = '${BF_OPENAL}/include ' BF_OPENAL_LIB = 'wrap_oal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' -# TODO - are these useful on win32? -# BF_CXX = '/usr' -# WITH_BF_STATICCXX = False -# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' - WITH_BF_ICONV = True BF_ICONV = LIBDIR + '/iconv' BF_ICONV_INC = '${BF_ICONV}/include' @@ -43,6 +38,12 @@ BF_JACK_INC = '${BF_JACK}/include' BF_JACK_LIB = 'libjack' BF_JACK_LIBPATH = '${BF_JACK}/lib' +WITH_BF_SNDFILE = False +BF_SNDFILE = LIBDIR + '/sndfile' +BF_SNDFILE_INC = '${BF_SNDFILE}/include' +BF_SNDFILE_LIB = 'libsndfile-1' +BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib' + WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' @@ -108,23 +109,6 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' WITH_BF_BINRELOC = False -#WITH_BF_NSPR = True -#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 = $(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 -# if this is not set. -# -# Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = True - # enable freetype2 support for text objects BF_WITH_FREETYPE = True BF_FREETYPE = LIBDIR + '/freetype' -- cgit v1.2.3 From 3f5115064aea902b3f6886dc688e7a20d771a212 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 1 Sep 2009 23:32:34 +0000 Subject: == SCons == * Add BGE_CXXFLAGS so we can get rid of hard-coded BGE compiler settings. This was only done for windows, but now linuxers and osxers should be able to set BGE-specific optimisation too. See the windows default configs for example. --- config/win32-vc-config.py | 1 + 1 file changed, 1 insertion(+) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index c50f41b6d4b..5c4342d4f30 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -149,6 +149,7 @@ CXX = 'cl.exe' CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267'] CXXFLAGS = ['/EHsc'] +BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast'] BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr'] -- cgit v1.2.3 From d89e1eb437e7a78cc91cb71d25bfc30f93f272b3 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 1 Sep 2009 23:43:00 +0000 Subject: * BGE optimisation tweaks. --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 5c4342d4f30..1e993565e98 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -149,7 +149,7 @@ CXX = 'cl.exe' CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267'] CXXFLAGS = ['/EHsc'] -BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast'] +BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE'] BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr'] -- cgit v1.2.3 From e7abdd7d56256b57d9e33326af253188ed9d96dc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 21 Sep 2009 03:16:26 +0000 Subject: Better unix filesystem integration as documented here http://wiki.blender.org/index.php/BlenderDev/Blender2.5/Unix_FHS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for scons WITH_BF_FHS enabled an alternative layout eg. scons WITH_BF_FHS=1 BF_INSTALLDIR="/usr/local" for CMake just run "make install" after make (CMAKE_INSTALL_PREFIX is used for the base path) Currently only scripts use both the system and user path correctly, other areas of blender have their own path code inline with lots of ifdefs, needs to be carefully updated. --- config/win32-vc-config.py | 1 - 1 file changed, 1 deletion(-) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 1e993565e98..4f2af93d0e3 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -173,4 +173,3 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/N BF_BUILDDIR = '..\\build\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc' -BF_DOCDIR='..\\install\\doc' -- cgit v1.2.3 From ebbb4ad753c1424f24cb5d1ff34169582a7c9917 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 23 Sep 2009 12:10:56 +0000 Subject: * fixes for compiling with scons/mingw when BF_DEBUG=1. Needs svn up in lib/windows, where I added necessary mingw libs. --- config/win32-vc-config.py | 1 + 1 file changed, 1 insertion(+) (limited to 'config/win32-vc-config.py') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 4f2af93d0e3..291aa023ec8 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -13,6 +13,7 @@ BF_PYTHON_VERSION = '3.1' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python31' +BF_PYTHON_DLL = '${BF_PYTHON_LIB}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = True -- cgit v1.2.3