[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17298] trunk/blender/source: Makefile fixes for compiling with new videotexture code.

[Ton Roosendaal]

Revision: 17298
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17298
Author:   ton
Date:     2008-11-02 19:12:45 +0100 (Sun, 02 Nov 2008)

Log Message:
-----------
Makefile fixes for compiling with new videotexture code.

Also: buttons for logic, controllers, didn't line up correct when 
multiple objects were selected (too little space)

Modified Paths:
--------------
    trunk/blender/source/Makefile
    trunk/blender/source/blender/src/buttons_logic.c
    trunk/blender/source/gameengine/Makefile
    trunk/blender/source/nan_compile.mk

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2008-11-02 18:05:11 UTC (rev 17297)
+++ trunk/blender/source/Makefile	2008-11-02 18:12:45 UTC (rev 17298)
@@ -142,6 +142,7 @@
     COMLIB += $(OCGDIR)/gameengine/OpenGLrasterizer/$(DEBUG_DIR)libOpenGLrasterizer.a
     COMLIB += $(OCGDIR)/gameengine/expression/$(DEBUG_DIR)libexpression.a
     COMLIB += $(OCGDIR)/gameengine/scenegraph/$(DEBUG_DIR)libscenegraph.a
+    COMLIB += $(OCGDIR)/gameengine/videotex/$(DEBUG_DIR)libvideotex.a
 #    COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libfuzzics.a
 #    COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libsolid.a
     COMLIB += $(NAN_MOTO)/lib/libmoto.a

Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c	2008-11-02 18:05:11 UTC (rev 17297)
+++ trunk/blender/source/blender/src/buttons_logic.c	2008-11-02 18:12:45 UTC (rev 17298)
@@ -3549,7 +3549,7 @@
 		if(ob->controllers.first) uiSetCurFont(block, UI_HELV);
 		uiDefButBitS(block, TOG, OB_ADDCONT, B_ADD_CONT, "Add",(short)(xco+width-40), yco, 50, 19, &ob->scaflag, 0, 0, 0, 0, "Add a new Controller");
 		uiBlockEndAlign(block);
-		yco-=17;
+		yco-=20;
 		
 		/* mark all actuators linked to these controllers */
 		/* note that some of these actuators could be from objects that are not in the display list.

Modified: trunk/blender/source/gameengine/Makefile
===================================================================
--- trunk/blender/source/gameengine/Makefile	2008-11-02 18:05:11 UTC (rev 17297)
+++ trunk/blender/source/gameengine/Makefile	2008-11-02 18:12:45 UTC (rev 17298)
@@ -35,7 +35,7 @@
 DIRS = BlenderRoutines
 DIRS += Converter
 DIRS += Expressions GameLogic Ketsji Rasterizer SceneGraph
-DIRS += Network Physics
+DIRS += Network Physics VideoTexture
 
 ifeq ($(WITH_BF_BLENDERGAMEENGINE),true)
   DIRS += GamePlayer

Modified: trunk/blender/source/nan_compile.mk
===================================================================
--- trunk/blender/source/nan_compile.mk	2008-11-02 18:05:11 UTC (rev 17297)
+++ trunk/blender/source/nan_compile.mk	2008-11-02 18:12:45 UTC (rev 17298)
@@ -89,8 +89,8 @@
         CFLAGS	+= -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing
         CCFLAGS	+= -pipe -fPIC  -funsigned-char -fno-strict-aliasing
 	endif
-    REL_CFLAGS	+= -O2
-    REL_CCFLAGS	+= -O2
+#    REL_CFLAGS	+= -O2
+#    REL_CCFLAGS	+= -O2
     CPPFLAGS	+= -D_THREAD_SAFE
     NAN_DEPEND	= true
     OPENGL_HEADERS = /System/Library/Frameworks/OpenGL.framework