[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21715] branches/blender2.5/blender: cmake option to disable SDL,
Campbell Barton
ideasman42 at gmail.com
Mon Jul 20 12:24:53 CEST 2009
Revision: 21715
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21715
Author: campbellbarton
Date: 2009-07-20 12:24:53 +0200 (Mon, 20 Jul 2009)
Log Message:
-----------
cmake option to disable SDL,
bpy_interface.c - change order of checking scripts to avoid calling stat on .py files.
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GameLogic/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-07-20 10:24:53 UTC (rev 21715)
@@ -63,6 +63,7 @@
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
+OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
@@ -133,9 +134,11 @@
SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
- FIND_PACKAGE(SDL)
- SET(SDL_INC ${SDL_INCLUDE_DIR})
- SET(SDL_LIB ${SDL_LIBRARY})
+ IF(WITH_SDL)
+ FIND_PACKAGE(SDL)
+ SET(SDL_INC ${SDL_INCLUDE_DIR})
+ SET(SDL_LIB ${SDL_LIBRARY})
+ ENDIF(WITH_SDL)
FIND_PATH(OPENEXR_INC
ImfXdr.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt 2009-07-20 10:24:53 UTC (rev 21715)
@@ -34,7 +34,6 @@
../../../extern/bullet2/src
../nodes ../../../extern/glew/include ../gpu ../makesrna
../../../intern/bsp/extern
- ${SDL_INC}
${ZLIB_INC}
)
@@ -55,6 +54,12 @@
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
+IF(WITH_SDL)
+ SET(INC ${INC} ${SDL_INC})
+ELSE(WITH_SDL)
+ ADD_DEFINITIONS(-DDISABLE_SDL)
+ENDIF(WITH_SDL)
+
IF(WITH_FFMPEG)
SET(INC ${INC} ${FFMPEG_INC})
ADD_DEFINITIONS(-DWITH_FFMPEG)
Modified: branches/blender2.5/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/SConscript 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/source/blender/blenlib/SConscript 2009-07-20 10:24:53 UTC (rev 21715)
@@ -9,9 +9,6 @@
incs += ' ' + env['BF_ZLIB_INC']
defs = ''
-if env['WITH_BF_SDL']:
- incs += ' ' + env['BF_SDL_INC']
-
if env['OURPLATFORM'] == 'linux2':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c 2009-07-20 10:24:53 UTC (rev 21715)
@@ -511,6 +511,13 @@
if (de->d_name[0] == '.') {
/* do nothing, probably .svn */
}
+ else if ((file_extension = strstr(de->d_name, ".py"))) {
+ /* normal py files? */
+ if(file_extension && file_extension[3] == '\0') {
+ de->d_name[(file_extension - de->d_name) + 1] = '\0';
+ bpy_import_module(de->d_name, reload);
+ }
+ }
#ifndef __linux__
else if( BLI_join_dirfile(path, dirname, de->d_name), S_ISDIR(BLI_exists(path))) {
#else
@@ -523,14 +530,6 @@
if(BLI_exists(path)) {
bpy_import_module(de->d_name, reload);
}
- } else {
- /* normal py files */
- file_extension = strstr(de->d_name, ".py");
-
- if(file_extension && file_extension[3] == '\0') {
- de->d_name[(file_extension - de->d_name) + 1] = '\0';
- bpy_import_module(de->d_name, reload);
- }
}
if(err==-1) {
Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-07-20 10:24:53 UTC (rev 21715)
@@ -62,6 +62,10 @@
ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON)
+IF(NOT WITH_SDL)
+ ADD_DEFINITIONS(-DDISABLE_SDL)
+ENDIF(NOT WITH_SDL)
+
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ADD_DEFINITIONS(-DWITH_BINRELOC)
INCLUDE_DIRECTORIES(${BINRELOC_INC})
Modified: branches/blender2.5/blender/source/gameengine/GameLogic/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/GameLogic/CMakeLists.txt 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/source/gameengine/GameLogic/CMakeLists.txt 2009-07-20 10:24:53 UTC (rev 21715)
@@ -35,8 +35,13 @@
../../../intern/moto/include
../../../source/gameengine/Rasterizer
${PYTHON_INC}
- ${SDL_INC}
)
+IF(WITH_SDL)
+ SET(INC ${INC} ${SDL_INC})
+ELSE(WITH_SDL)
+ ADD_DEFINITIONS(-DDISABLE_SDL)
+ENDIF(WITH_SDL)
+
BLENDERLIB(bf_logic "${SRC}" "${INC}")
#env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 110] )
Modified: branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt 2009-07-20 07:50:57 UTC (rev 21714)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt 2009-07-20 10:24:53 UTC (rev 21715)
@@ -26,20 +26,6 @@
FILE(GLOB SRC *.cpp)
-#XXX disabled for 2.5 because of missing python
-#SET(SRC
-# ${SRC}
-# ../../../source/blender/python/api2_2x/Mathutils.c
-# ../../../source/blender/python/api2_2x/Geometry.c
-# ../../../source/blender/python/api2_2x/constant.c
-# ../../../source/blender/python/api2_2x/euler.c
-# ../../../source/blender/python/api2_2x/matrix.c
-# ../../../source/blender/python/api2_2x/quat.c
-# ../../../source/blender/python/api2_2x/vector.c
-# ../../../source/blender/python/api2_2x/bpy_internal_import.c
-# ../../../source/blender/python/api2_2x/BGL.c
-#)
-
SET(INC
.
../../../source/kernel/gen_system
@@ -77,8 +63,13 @@
../../../extern/solid
../../../extern/glew/include
${PYTHON_INC}
- ${SDL_INC}
)
+IF(WITH_SDL)
+ SET(INC ${INC} ${SDL_INC})
+ELSE(WITH_SDL)
+ ADD_DEFINITIONS(-DDISABLE_SDL)
+ENDIF(WITH_SDL)
+
BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
#env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )
More information about the Bf-blender-cvs
mailing list