[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11249] branches/soc-2007-maike/source/ gameengine: Gameengine compiles now with Makefiles.

Chris Want cwant at ualberta.ca
Thu Jul 12 19:54:47 CEST 2007


Revision: 11249
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11249
Author:   hos
Date:     2007-07-12 19:54:47 +0200 (Thu, 12 Jul 2007)

Log Message:
-----------
Gameengine compiles now with Makefiles. The gameplayer still has link
problems because glsl routines defined in source/blender/src are being
called in source/blender/blenkernel, which is generally frowned upon
(the fix is either to move code from src --> blenkernel, or to
create stubs.

The errors in particular are:

/tmp/soc-2007-maike/obj/linux-glibc2.5-x86_64/blender/blenkernel/libblenkernel.a
(material.o): In function `copy_material':
material.c:(.text+0x19c7): undefined reference to `glsl_active'
material.c:(.text+0x19d5): undefined reference to `glsl_create_materialtree'
/tmp/soc-2007-maike/obj/linux-glibc2.5-x86_64/blender/blenkernel/libblenkernel.a
(material.o): In function `init_material':
material.c:(.text+0x1ff6): undefined reference to `glsl_firstdraw'
/tmp/soc-2007-maike/obj/linux-glibc2.5-x86_64/blender/blenkernel/libblenkernel.a
(material.o): In function `init_def_material':
material.c:(.text+0x2195): undefined reference to `glsl_init_ghash'
/tmp/soc-2007-maike/obj/linux-glibc2.5-x86_64/blender/blenkernel/libblenkernel.a
(material.o): In function `init_material':
material.c:(.text+0x2007): undefined reference to `glsl_create_materialtree'
/tmp/soc-2007-maike/obj/linux-glibc2.5-x86_64/blender/blenkernel/libblenkernel.a
(scene.o): In function `set_scene_bg':
scene.c:(.text+0x585): undefined reference to `glsl_active'
scene.c:(.text+0x685): undefined reference to `glsl_firstdraw'
scene.c:(.text+0x699): undefined reference to `glsl_active'
scene.c:(.text+0x6b4): undefined reference to `glsl_free_all'
scene.c:(.text+0x694): undefined reference to `glsl_change_state'
scene.c:(.text+0x6af): undefined reference to `glsl_create_all'
collect2: ld returned 1 exit status

Modified Paths:
--------------
    branches/soc-2007-maike/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2007-maike/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/Makefile
    branches/soc-2007-maike/source/gameengine/Ketsji/Makefile
    branches/soc-2007-maike/source/gameengine/Rasterizer/Makefile

Modified: branches/soc-2007-maike/source/gameengine/BlenderRoutines/Makefile
===================================================================
--- branches/soc-2007-maike/source/gameengine/BlenderRoutines/Makefile	2007-07-12 17:47:39 UTC (rev 11248)
+++ branches/soc-2007-maike/source/gameengine/BlenderRoutines/Makefile	2007-07-12 17:54:47 UTC (rev 11249)
@@ -39,6 +39,7 @@
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_GLEW)/include    
 CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include
 CPPFLAGS += -I$(NAN_SOLID)
 CPPFLAGS += -I$(NAN_STRING)/include    

Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/common/Makefile
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/common/Makefile	2007-07-12 17:47:39 UTC (rev 11248)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/common/Makefile	2007-07-12 17:54:47 UTC (rev 11249)
@@ -39,6 +39,7 @@
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_GLEW)/include    
 
 CPPFLAGS += -I../../../blender/blenkernel
 CPPFLAGS += -I../../../blender/blenloader

Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/Makefile
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/Makefile	2007-07-12 17:47:39 UTC (rev 11248)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/Makefile	2007-07-12 17:54:47 UTC (rev 11249)
@@ -40,6 +40,7 @@
 
 # OpenGL header files
 CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_GLEW)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_BMFONT)/include
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include

Modified: branches/soc-2007-maike/source/gameengine/Ketsji/Makefile
===================================================================
--- branches/soc-2007-maike/source/gameengine/Ketsji/Makefile	2007-07-12 17:47:39 UTC (rev 11248)
+++ branches/soc-2007-maike/source/gameengine/Ketsji/Makefile	2007-07-12 17:54:47 UTC (rev 11249)
@@ -40,6 +40,7 @@
 
 CPPFLAGS += $(OGL_CPPFLAGS)
 CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_GLEW)/include    
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -I../../blender/python
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    

Modified: branches/soc-2007-maike/source/gameengine/Rasterizer/Makefile
===================================================================
--- branches/soc-2007-maike/source/gameengine/Rasterizer/Makefile	2007-07-12 17:47:39 UTC (rev 11248)
+++ branches/soc-2007-maike/source/gameengine/Rasterizer/Makefile	2007-07-12 17:54:47 UTC (rev 11249)
@@ -39,6 +39,7 @@
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_GLEW)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../kernel/gen_system





More information about the Bf-blender-cvs mailing list