Makefile fixes for compiling with new videotexture code.
authorTon Roosendaal <ton@blender.org>
Sun, 2 Nov 2008 18:12:45 +0000 (18:12 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 2 Nov 2008 18:12:45 +0000 (18:12 +0000)
Also: buttons for logic, controllers, didn't line up correct when
multiple objects were selected (too little space)

source/Makefile
source/blender/src/buttons_logic.c
source/gameengine/Makefile
source/nan_compile.mk

index 99155206987448c4edb90fd2cbbf0b047c8d61b8..558a844eca790df8d58096d6b7f3e663e45f54cd 100644 (file)
@@ -142,6 +142,7 @@ ifneq ($(NAN_NO_KETSJI),true)
     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
index 0dcdc36fdcdda1eed2483a1a31dfc73f7494b6fe..8aca111f41ff24f65656a451d8bfd7cd83b23221 100644 (file)
@@ -3549,7 +3549,7 @@ void logic_buts(void)
                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.
index 1d3bc8c2058f89a78bdcd29ab0f9d4964a245215..51bc0f7d39f4ce657d4a4455be3bc4261371e3be 100644 (file)
@@ -35,7 +35,7 @@ DIR = $(OCGDIR)/gameengine
 DIRS = BlenderRoutines
 DIRS += Converter
 DIRS += Expressions GameLogic Ketsji Rasterizer SceneGraph
-DIRS += Network Physics
+DIRS += Network Physics VideoTexture
 
 ifeq ($(WITH_BF_BLENDERGAMEENGINE),true)
   DIRS += GamePlayer
index 151c741e8b4d3e5074a992f34af5f005c10aee57..4b13ef8f678de04c6a3508fff18fb27bcf39f2fd 100644 (file)
@@ -89,8 +89,8 @@ ifeq ($(OS),darwin)
         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