From 613646b33e5fde13158a8d8644df8c97bdde2fbb Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 25 Jun 2007 19:50:25 +0000 Subject: This commit is a modified version of patch #6860 It adds read only dds support. (Writing will come later) Kent --- config/linux2-config.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index a041f518ba7..edc7f26c690 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -32,6 +32,8 @@ BF_OPENEXR = '/usr' 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' BF_JPEG_INC = '${BF_JPEG}/include' -- cgit v1.2.3 From 443a64135ea25b19cb5212c99cf85444ebb782d0 Mon Sep 17 00:00:00 2001 From: Joilnen Leite Date: Mon, 30 Jul 2007 15:59:16 +0000 Subject: Font preview --- config/linux2-config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index edc7f26c690..3e442892748 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -5,7 +5,7 @@ WITH_BF_VERSE = 'false' BF_VERSE_INCLUDE = "#extern/verse/dist" BF_PYTHON = '/usr' -BF_PYTHON_VERSION = '2.5' +BF_PYTHON_VERSION = '2.4' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' @@ -27,7 +27,7 @@ BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer WITH_BF_FMOD = 'false' BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' +WITH_BF_OPENEXR = 'false' BF_OPENEXR = '/usr' BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' -- cgit v1.2.3 From 127a232a106e0db118c3bc5b541e4b7f1c4197e5 Mon Sep 17 00:00:00 2001 From: Joilnen Leite Date: Mon, 30 Jul 2007 16:44:35 +0000 Subject: Reverting to python 2.5 and openEXR true as default --- config/linux2-config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index 3e442892748..edc7f26c690 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -5,7 +5,7 @@ WITH_BF_VERSE = 'false' BF_VERSE_INCLUDE = "#extern/verse/dist" BF_PYTHON = '/usr' -BF_PYTHON_VERSION = '2.4' +BF_PYTHON_VERSION = '2.5' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' @@ -27,7 +27,7 @@ BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer WITH_BF_FMOD = 'false' BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'false' +WITH_BF_OPENEXR = 'true' BF_OPENEXR = '/usr' BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' -- cgit v1.2.3 From 3596175859ba2c90a8e6838e7bb401ca713274c3 Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Sun, 23 Sep 2007 17:16:13 +0000 Subject: == Sequencer / FFMPEG == Updated to latest FFMPEG-version, which uses new swscaler. --- config/linux2-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index edc7f26c690..90fe74cee6b 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -119,7 +119,7 @@ WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG BF_FFMPEG = '/usr' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat avcodec avutil' +BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' -- cgit v1.2.3 From 54dca15a0e277da419b4dfae2cd4c123fcd67fd8 Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Thu, 27 Sep 2007 06:47:59 +0000 Subject: == FFMPEG == First round of scons support for internal ffmpeg. --- config/linux2-config.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index 90fe74cee6b..863885dc0bd 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -115,11 +115,13 @@ BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # enable ffmpeg support -WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG -BF_FFMPEG = '/usr' +WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG +BF_FFMPEG = '#extern/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' +BF_FFMPEG_LIB = '' +# Uncomment the following line to use external ffmpeg +# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' -- cgit v1.2.3 From 41989bf1a770cbc54500f03bb2a6a80279b5153b Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Thu, 27 Sep 2007 06:53:21 +0000 Subject: == FFMPEG == Minor fix for using system's ffmpeg. --- config/linux2-config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index 863885dc0bd..38af4de4ac7 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -120,8 +120,9 @@ BF_FFMPEG = '#extern/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = '' -# Uncomment the following line to use external ffmpeg +# Uncomment the following two lines to use system's ffmpeg # BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' +# BF_FFMPEG = '/usr' # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' -- cgit v1.2.3 From 637a22bcc37f7da13e683555a6f6468e03cd4656 Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Thu, 27 Sep 2007 07:19:10 +0000 Subject: == FFMPEG == Another fix for external ffmpeg building. --- config/linux2-config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index 38af4de4ac7..4bf7e755c49 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -117,12 +117,12 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # enable ffmpeg support WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG BF_FFMPEG = '#extern/ffmpeg' -BF_FFMPEG_INC = '${BF_FFMPEG}/include' -BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = '' # Uncomment the following two lines to use system's ffmpeg -# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' # BF_FFMPEG = '/usr' +# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' +BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' -- cgit v1.2.3 From 320ac3f0e289b2c4d8add38926913eb2d4809f55 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Fri, 18 Jan 2008 21:39:47 +0000 Subject: Fixing makefiles for binreloc I made it use flags like other things default on for linux. ideasman helped me get scons working. Cmake still needs some love... Kent --- config/linux2-config.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index 4bf7e755c49..abba0f97ef2 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -114,6 +114,8 @@ 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 = 'true' # -DWITH_FFMPEG BF_FFMPEG = '#extern/ffmpeg' -- cgit v1.2.3 From 5a4fc7a8fd3778388c92953a8e30aa1415f81122 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 Jan 2008 18:52:39 +0000 Subject: made BINRELOC disabled by default with scons, only enable for linux --- config/linux2-config.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index abba0f97ef2..5d813c176ea 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -134,6 +134,8 @@ BF_OPENGL_LIB = 'GL GLU X11 Xi' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a' +WITH_BF_BINRELOC = 'true' + ## CC = 'gcc' CXX = 'g++' -- cgit v1.2.3 From 2fa4ff4dac684fd6fd2dd50b364cbc084db9114e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 Jan 2008 19:01:19 +0000 Subject: missing header from editipo.c --- config/linux2-config.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index 5d813c176ea..abba0f97ef2 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -134,8 +134,6 @@ BF_OPENGL_LIB = 'GL GLU X11 Xi' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a' -WITH_BF_BINRELOC = 'true' - ## CC = 'gcc' CXX = 'g++' -- cgit v1.2.3 From 0f8baa98ad652df0bd9acff581a00fa55250023e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Jan 2008 18:47:40 +0000 Subject: added a note for scons openexr compiling, because I had some trouble using our own exr build and had to work out whats goin on. --- config/linux2-config.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index abba0f97ef2..ac921f59a9e 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -29,8 +29,13 @@ 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="/shared/software/exr/include/OpenEXR /shared/software/exr/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' -- cgit v1.2.3 From ce5f187d8a76120fc64b2d8daa727b2e82502df1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Jan 2008 19:25:10 +0000 Subject: oops, left in a line I shouldnt have --- config/linux2-config.py | 1 - 1 file changed, 1 deletion(-) (limited to 'config/linux2-config.py') diff --git a/config/linux2-config.py b/config/linux2-config.py index ac921f59a9e..4d8b5c97512 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -32,7 +32,6 @@ 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="/shared/software/exr/include/OpenEXR /shared/software/exr/include" BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' # BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' -- cgit v1.2.3