[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22203] branches/blender2.5/blender: remove makefile cruft, mostly BGE related references to SUMO, Fuzzics, Blenkey etc.

Campbell Barton ideasman42 at gmail.com
Tue Aug 4 05:13:37 CEST 2009


Revision: 22203
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22203
Author:   campbellbarton
Date:     2009-08-04 05:13:36 +0200 (Tue, 04 Aug 2009)

Log Message:
-----------
remove makefile cruft, mostly BGE related references to SUMO, Fuzzics, Blenkey etc.
also remove define MOZ_NOT_NET that was being used all over for telling the plugin to link against mozilla (not netscape)

Modified Paths:
--------------
    branches/blender2.5/blender/make/example_scripts/linux_nanmakefiles.sh
    branches/blender2.5/blender/make/example_scripts/sunos_nanmakefiles.sh
    branches/blender2.5/blender/source/Makefile
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
    branches/blender2.5/blender/source/gameengine/Converter/Makefile
    branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
    branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile
    branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
    branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
    branches/blender2.5/blender/source/gameengine/Physics/Dummy/Makefile
    branches/blender2.5/blender/source/gameengine/Physics/common/Makefile
    branches/blender2.5/blender/source/nan_compile.mk
    branches/blender2.5/blender/source/nan_definitions.mk
    branches/blender2.5/blender/source/nan_link.mk

Modified: branches/blender2.5/blender/make/example_scripts/linux_nanmakefiles.sh
===================================================================
--- branches/blender2.5/blender/make/example_scripts/linux_nanmakefiles.sh	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/make/example_scripts/linux_nanmakefiles.sh	2009-08-04 03:13:36 UTC (rev 22203)
@@ -20,7 +20,7 @@
 export NAN_ODE=/usr/local
 export NAN_ZLIB=/usr/local
 export NAN_FREETYPE=/usr/local
-# CPPFLAGS +=-DMOZ_NOT_NET
+
 export NAN_MOZILLA_INC=/usr/local/include/mozilla-1.0.1/
 export NAN_MOZILLA_LIB=/usr/local/lib/mozilla-1.0.1/
 #export NAN_NSPR=/scratch/irulan/mein/nspr-4.2.2/mozilla/nsprpub/dist/

Modified: branches/blender2.5/blender/make/example_scripts/sunos_nanmakefiles.sh
===================================================================
--- branches/blender2.5/blender/make/example_scripts/sunos_nanmakefiles.sh	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/make/example_scripts/sunos_nanmakefiles.sh	2009-08-04 03:13:36 UTC (rev 22203)
@@ -17,7 +17,7 @@
 export NAN_OPENSSL=/soft/ssl/openssl-0.9.6e
 export NAN_ZLIB=/usr/local
 export NAN_FREETYPE=/usr/local
-# CPPFLAGS +=-DMOZ_NOT_NET
+
 export NAN_MOZILLA_INC=/usr/local/include/mozilla-1.0.1/
 export NAN_MOZILLA_LIB=/usr/local/lib/mozilla-1.0.1/
 export NAN_NSPR=/scratch/irulan/mein/nspr-4.2.2/mozilla/nsprpub/dist/

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -114,8 +114,6 @@
     COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
-    COMLIB += $(NAN_QHULL)/lib/libqhull.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a

Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -38,7 +38,6 @@
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I$(NAN_FUZZICS)/include
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)

Modified: branches/blender2.5/blender/source/gameengine/Converter/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/Converter/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -39,7 +39,6 @@
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
-CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BULLET2)/include
 
 CPPFLAGS += -I../../blender

Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -47,7 +47,6 @@
 CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
-CPPFLAGS += -I$(NAN_FUZZICS)/include
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_PNG)/include

Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -56,7 +56,6 @@
 CPPFLAGS += -I../../../../gameengine/Rasterizer/RAS_OpenGLRasterizer
 CPPFLAGS += -I../../../../gameengine/SceneGraph
 
-CPPFLAGS += -I$(NAN_FUZZICS)/include
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 CPPFLAGS += -I$(NAN_MOTO)/include
 

Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -63,9 +63,6 @@
 CPPFLAGS += -I../../../../Network
 CPPFLAGS += -I../../../../Network/LoopBackNetwork
 
-# physics
-CPPFLAGS += -I$(NAN_FUZZICS)/include
-
 # moto
 CPPFLAGS += -I$(NAN_MOTO)/include
 

Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp	2009-08-04 03:13:36 UTC (rev 22203)
@@ -31,13 +31,7 @@
 #include <stdio.h>
 
 #include "nsCOMPtr.h"
-
-#ifdef MOZ_NOT_NET
 #include "nsIModule.h"
-#else
-#include "nsIComponentManager.h"
-#endif
-
 #include "nsIServiceManager.h"
 #include "nsIClassInfo.h"
 #include "nsIGenericFactory.h"
@@ -99,11 +93,7 @@
 	nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
 	if (NS_FAILED(rv)) return rv;
 	
-#ifdef MOZ_NOT_NET
 	nsCOMPtr<nsIComponentManagerObsolete> compMgr = 
-#else
-	nsCOMPtr<nsIComponentManager> compMgr = 
-#endif
 		do_GetService(kComponentManagerCID, &rv);
 	if (NS_FAILED(rv)) return rv;
 
@@ -135,11 +125,7 @@
 	nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
 	if (NS_FAILED(rv)) return rv;
 
-#ifdef MOZ_NOT_NET
 	nsCOMPtr<nsIComponentManagerObsolete> compMgr = 
-#else
-	nsCOMPtr<nsIComponentManager> compMgr = 
-#endif
 		do_GetService(kComponentManagerCID, &rv);
 	if (NS_FAILED(rv)) return rv;
 

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -44,8 +44,7 @@
 CPPFLAGS += -I../../blender/python/generic
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
-CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_MOTO)/include
-CPPFLAGS += -I$(NAN_SOLID)/include
+CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BULLET2)/include
 CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer
 CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph

Modified: branches/blender2.5/blender/source/gameengine/Physics/Dummy/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Physics/Dummy/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/Physics/Dummy/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -39,7 +39,7 @@
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
-CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_MOTO)/include
+CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I../../Physics/common
 CPPFLAGS += -I../../Physics/Dummy

Modified: branches/blender2.5/blender/source/gameengine/Physics/common/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Physics/common/Makefile	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/gameengine/Physics/common/Makefile	2009-08-04 03:13:36 UTC (rev 22203)
@@ -40,7 +40,7 @@
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
-CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_MOTO)/include
+CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../blender
 # these two needed because of blenkernel
 CPPFLAGS += -I../../blender/makesdna

Modified: branches/blender2.5/blender/source/nan_compile.mk
===================================================================
--- branches/blender2.5/blender/source/nan_compile.mk	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/nan_compile.mk	2009-08-04 03:13:36 UTC (rev 22203)
@@ -39,8 +39,6 @@
 # Uncomment next lines to enable integrated game engine
 ifneq ($(NAN_NO_KETSJI), true)
     CFLAGS  += -DGAMEBLENDER=1
-    CFLAGS  += -DUSE_SUMO_SOLID
-    CCFLAGS += -DUSE_SUMO_SOLID
     ifeq ($(NAN_USE_BULLET), true)
       CFLAGS  += -DUSE_BULLET -DWITH_BULLET
       CCFLAGS += -DUSE_BULLET -DWITH_BULLET

Modified: branches/blender2.5/blender/source/nan_definitions.mk
===================================================================
--- branches/blender2.5/blender/source/nan_definitions.mk	2009-08-04 01:08:00 UTC (rev 22202)
+++ branches/blender2.5/blender/source/nan_definitions.mk	2009-08-04 03:13:36 UTC (rev 22203)
@@ -81,18 +81,9 @@
     endif
 
     export NAN_MOTO ?= $(LCGDIR)/moto
-ifeq ($(FREE_WINDOWS), true)
-    export NAN_SOLID ?= $(LCGDIR)/gcc/solid
-    export NAN_QHULL ?= $(LCGDIR)/gcc/qhull
-else
-    export NAN_SOLID ?= $(LCGDIR)/solid
-    export NAN_QHULL ?= $(LCGDIR)/qhull
-endif
     export BF_PROFILE ?= false
     export NAN_USE_BULLET ?= true
     export NAN_BULLET2 ?= $(LCGDIR)/bullet2

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list