disable game engine and gameplayer for all platforms except windows.
authorErwin Coumans <blender@erwincoumans.com>
Fri, 6 Jan 2006 09:02:53 +0000 (09:02 +0000)
committerErwin Coumans <blender@erwincoumans.com>
Fri, 6 Jan 2006 09:02:53 +0000 (09:02 +0000)
Then after cvs is unfrozen, development can continue.

SConstruct
source/gameengine/Converter/BL_Shader.cpp
source/gameengine/Converter/SConscript
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
source/nan_definitions.mk

index 122147f..963d76b 100644 (file)
@@ -63,7 +63,7 @@ env = Environment (ENV = os.environ)
 
 if sys.platform == 'linux2' or sys.platform == 'linux-i386':
        use_international = 'true'
-       use_gameengine = 'true'
+       use_gameengine = 'false'
        use_openal = 'false'
        use_fmod = 'false'
        use_quicktime = 'false'
@@ -74,7 +74,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
        use_fluidsim = 'true'
        build_blender_dynamic = 'true'
        build_blender_static = 'false'
-       build_blender_player = 'true'
+       build_blender_player = 'false'
        build_blender_plugin = 'false'
        release_flags = ['-O2']
        debug_flags = ['-O2', '-g']
@@ -152,7 +152,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
 
 elif sys.platform == 'darwin':
        use_international = 'true'
-       use_gameengine = 'true'
+       use_gameengine = 'false'
        use_openal = 'true'
        use_fmod = 'false'
        use_openal = 'false'
@@ -165,7 +165,7 @@ elif sys.platform == 'darwin':
        use_fluidsim = 'true'
        build_blender_dynamic = 'true'
        build_blender_static = 'false'
-       build_blender_player = 'true'
+       build_blender_player = 'false'
        build_blender_plugin = 'false'
        # TODO: replace darwin-6.1-powerpc with the actual directiory on the
        #       build machine
index c957241..f97cc82 100644 (file)
@@ -132,7 +132,10 @@ bool BL_Shader::LinkProgram()
 void BL_Shader::printInfo(unsigned int pr)
 {
 #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);
 
        if(length > 1)
index 40c51da..65b3d9d 100755 (executable)
@@ -47,6 +47,7 @@ kx_converter_env.Append (CPPPATH = ['.',
                                     '#source/blender/include',
                                     '#source/blender/makesdna',
                                     '#source/gameengine/Rasterizer',
+                                   '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
                                     '#source/gameengine/GameLogic',
                                     '#source/gameengine/Expressions',
                                     '#source/gameengine/Network',
index 472acc5..e2e71f4 100644 (file)
@@ -1,6 +1,7 @@
 // ------------------------------------
 // ...
 // ------------------------------------
+#ifdef WIN32
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -138,8 +139,7 @@ void KX_BlenderMaterial::OnConstruction()
 
        int 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
                if( mMaterial->mapping[i].mapping & USEENV ) {
                        if(!RAS_EXT_support._ARB_texture_cube_map) {
@@ -973,3 +973,4 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, setTexture , "setTexture( index, tex)")
        return NULL;
 }
 
+#endif //WIN32
index acb16cf..4bbf9af 100644 (file)
        GL_ARB_multitexture
 ---------------------------------------------------------------------------- */
 #ifndef GL_ARB_multitexture
-       #define GL_ARB_multitexture 1
+#ifdef WIN32   
+dsadsa
+#define GL_ARB_multitexture 1
+#endif //WIN32
 #endif
 
 #ifdef GL_ARB_multitexture
index ab48ec3..ade6058 100644 (file)
@@ -46,7 +46,7 @@ all debug::
 
   # First generic defaults for all platforms which should be constant.
   # Note: ?= lets these defaults be overruled by environment variables,
-
+    export NAN_NO_KETSJI=true
     export SRCHOME ?= $(NANBLENDERHOME)/source
     export CONFIG_GUESS := $(shell ${SRCHOME}/tools/guess/guessconfig)
     export OS := $(shell echo ${CONFIG_GUESS} | sed -e 's/-.*//')
@@ -413,6 +413,7 @@ endif
   ifeq ($(OS),windows)
 
     export ID = $(LOGNAME)
+    export NAN_NO_KETSJI=false
     export NAN_PYTHON ?= $(LCGDIR)/python
     export NAN_ICONV ?= $(LCGDIR)/iconv
     export NAN_PYTHON_VERSION ?= 2.4