kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

cmake option to disable SDL,

Browse Source 
bpy_interface.c - change order of checking scripts to avoid calling stat on .py files.
This commit is contained in:
Campbell Barton 2009-07-20 10:24:53 +00:00
parent b76009232e
commit 4d0a6fee4a
7 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -63,6 +63,7 @@ OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
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 @@ IF(UNIX AND NOT APPLE)
SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
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

7
source/blender/blenkernel/CMakeLists.txt
View File

@ -34,7 +34,6 @@ SET(INC
../../../extern/bullet2/src
../nodes ../../../extern/glew/include ../gpu ../makesrna
../../../intern/bsp/extern
${SDL_INC}
${ZLIB_INC}
)
@ -55,6 +54,12 @@ IF(WITH_QUICKTIME)
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)

3
source/blender/blenlib/SConscript
View File

@ -9,9 +9,6 @@ incs += ' ' + env['BF_FREETYPE_INC']
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'

15
source/blender/python/intern/bpy_interface.c
View File

@ -511,6 +511,13 @@ void BPY_run_ui_scripts(bContext *C, int reload)
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 @@ void BPY_run_ui_scripts(bContext *C, int reload)
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) {

4
source/creator/CMakeLists.txt
View File

@ -62,6 +62,10 @@ ELSE(WITH_PYTHON)
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})

7
source/gameengine/GameLogic/CMakeLists.txt
View File

@ -35,8 +35,13 @@ SET(INC
../../../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] )

21
source/gameengine/Ketsji/CMakeLists.txt
View File

@ -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 @@ SET(INC
../../../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 )