Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

disable game engine and gameplayer for all platforms except windows.

Browse Source 
Then after cvs is unfrozen, development can continue.
This commit is contained in:
Erwin Coumans
2006-01-06 09:02:53 +00:00
parent 32a64604bc
commit 0002cd63a5
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@@ -63,7 +63,7 @@ env = Environment (ENV = os.environ)
if sys.platform == 'linux2' or sys.platform == 'linux-i386': if sys.platform == 'linux2' or sys.platform == 'linux-i386':
use_international = 'true' use_international = 'true'
use_gameengine = 'true' use_gameengine = 'false'
use_openal = 'false' use_openal = 'false'
use_fmod = 'false' use_fmod = 'false'
use_quicktime = 'false' use_quicktime = 'false'
@@ -74,7 +74,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
use_fluidsim = 'true' use_fluidsim = 'true'
build_blender_dynamic = 'true' build_blender_dynamic = 'true'
build_blender_static = 'false' build_blender_static = 'false'
build_blender_player = 'true' build_blender_player = 'false'
build_blender_plugin = 'false' build_blender_plugin = 'false'
release_flags = ['-O2'] release_flags = ['-O2']
debug_flags = ['-O2', '-g'] debug_flags = ['-O2', '-g']
@@ -152,7 +152,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
use_international = 'true' use_international = 'true'
use_gameengine = 'true' use_gameengine = 'false'
use_openal = 'true' use_openal = 'true'
use_fmod = 'false' use_fmod = 'false'
use_openal = 'false' use_openal = 'false'
@@ -165,7 +165,7 @@ elif sys.platform == 'darwin':
use_fluidsim = 'true' use_fluidsim = 'true'
build_blender_dynamic = 'true' build_blender_dynamic = 'true'
build_blender_static = 'false' build_blender_static = 'false'
build_blender_player = 'true' build_blender_player = 'false'
build_blender_plugin = 'false' build_blender_plugin = 'false'
# TODO: replace darwin-6.1-powerpc with the actual directiory on the # TODO: replace darwin-6.1-powerpc with the actual directiory on the
# build machine # build machine

5
source/gameengine/Converter/BL_Shader.cpp
View File

@@ -132,7 +132,10 @@ bool BL_Shader::LinkProgram()
void BL_Shader::printInfo(unsigned int pr) void BL_Shader::printInfo(unsigned int pr)
{ {
#ifdef GL_ARB_shader_objects #ifdef GL_ARB_shader_objects
int length=0; #ifndef GLcharARB
typedef char GLcharARB;
#endif
int length=0;
glGetObjectParameterivARB(pr, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length); glGetObjectParameterivARB(pr, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
if(length > 1) if(length > 1)

1
source/gameengine/Converter/SConscript
View File

@@ -47,6 +47,7 @@ kx_converter_env.Append (CPPPATH = ['.',
'#source/blender/include', '#source/blender/include',
'#source/blender/makesdna', '#source/blender/makesdna',
'#source/gameengine/Rasterizer', '#source/gameengine/Rasterizer',
'#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
'#source/gameengine/GameLogic', '#source/gameengine/GameLogic',
'#source/gameengine/Expressions', '#source/gameengine/Expressions',
'#source/gameengine/Network', '#source/gameengine/Network',

5
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
View File

@@ -1,6 +1,7 @@
// ------------------------------------ // ------------------------------------
// ... // ...
// ------------------------------------ // ------------------------------------
#ifdef WIN32
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
@@ -138,8 +139,7 @@ void KX_BlenderMaterial::OnConstruction()
int i; int i;
for(i=0; i<mMaterial->num_enabled; i++) { for(i=0; i<mMaterial->num_enabled; i++) {
glActiveTextureARB(GL_TEXTURE0_ARB+i); glActiveTextureARB(GL_TEXTURE0_ARB+i);
#ifdef GL_ARB_texture_cube_map #ifdef GL_ARB_texture_cube_map
if( mMaterial->mapping[i].mapping & USEENV ) { if( mMaterial->mapping[i].mapping & USEENV ) {
if(!RAS_EXT_support._ARB_texture_cube_map) { if(!RAS_EXT_support._ARB_texture_cube_map) {
@@ -973,3 +973,4 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, setTexture , "setTexture( index, tex)")
return NULL; return NULL;
} }
#endif //WIN32

5
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
View File

@@ -11,7 +11,10 @@
GL_ARB_multitexture GL_ARB_multitexture
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
#ifndef GL_ARB_multitexture #ifndef GL_ARB_multitexture
#define GL_ARB_multitexture 1 #ifdef WIN32
dsadsa
#define GL_ARB_multitexture 1
#endif //WIN32
#endif #endif
#ifdef GL_ARB_multitexture #ifdef GL_ARB_multitexture

3
source/nan_definitions.mk
View File

@@ -46,7 +46,7 @@ all debug::
# First generic defaults for all platforms which should be constant. # First generic defaults for all platforms which should be constant.
# Note: ?= lets these defaults be overruled by environment variables, # Note: ?= lets these defaults be overruled by environment variables,
export NAN_NO_KETSJI=true
export SRCHOME ?= $(NANBLENDERHOME)/source export SRCHOME ?= $(NANBLENDERHOME)/source
export CONFIG_GUESS := $(shell ${SRCHOME}/tools/guess/guessconfig) export CONFIG_GUESS := $(shell ${SRCHOME}/tools/guess/guessconfig)
export OS := $(shell echo ${CONFIG_GUESS} | sed -e 's/-.*//') export OS := $(shell echo ${CONFIG_GUESS} | sed -e 's/-.*//')
@@ -413,6 +413,7 @@ endif
ifeq ($(OS),windows) ifeq ($(OS),windows)
export ID = $(LOGNAME) export ID = $(LOGNAME)
export NAN_NO_KETSJI=false
export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_ICONV ?= $(LCGDIR)/iconv export NAN_ICONV ?= $(LCGDIR)/iconv
export NAN_PYTHON_VERSION ?= 2.4 export NAN_PYTHON_VERSION ?= 2.4