[Bf-committers] Please reverse this CVS commit: blender/source/blender/blenkernel/bad_level_call_stubs stubs.c

Gilles J. Seguin bf-committers@blender.org
Fri, 13 Dec 2002 23:33:22 -0500


This is a multi-part message in MIME format.
--------------0EC51BB93EF3364A77F4C7FD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Maarten Gribnau wrote:
> 
> On Friday, Dec 13, 2002, at 22:24 Europe/Amsterdam, Gilles J. Seguin
> wrote:
> >> Sure, I know it is there but I am building the blender player which is
> >> not supposed to link with the bpython library.
> >
> > And it is not supposed to
> > see attachment, can you confirm
> It seems not to be linking with libbpython.a  indeed. But that makes me
> wonder about the breaking build  even more. Can you show me a log of
> the error?
> 
> BTW
> I think the player should not link with mxTextTools.so. This is only
> needed for VRML2 import in Blender. Same for libblenpluginapi.a
> (Blender plug-ins) and libbloutines.a (Blender<->player coupling.

I do not remember either for mxTextTools.so
lets find out.

Remove linking of libraries where not necessary
--------------0EC51BB93EF3364A77F4C7FD
Content-Type: text/plain; charset=us-ascii;
 name="check03.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="check03.diff"

Index: blender/source/Makefile
===================================================================
RCS file: /cvs01/blender/source/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	2002/11/13 16:09:38	1.12
+++ Makefile	2002/12/14 04:26:13
@@ -122,12 +122,12 @@
 # the repeat entries could probably be trimmed down.
     COMLIB = $(OCGDIR)/blender/blenkernel/$(DEBUG_DIR)libblenkernel.a
     COMLIB += $(OCGDIR)/blender/blenloader/$(DEBUG_DIR)libblenloader.a
-    COMLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a
+#    COMLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a
     COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a
     COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
     COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a
     COMLIB += $(NAN_JPEG)/lib/libjpeg.a
-    COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
+#    COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
     COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
@@ -164,6 +164,9 @@
     COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
     COMLIB += $(NAN_PNG)/lib/libpng.a
 
+    COMLIB2 = $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a
+    COMLIB2 += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
+
     BCLIB = $(NAN_IKSOLVER)/lib/libiksolver.a
     BCLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     BCLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
@@ -344,7 +347,7 @@
     BINTARGETS += blenderpublisher
   endif
     PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    PYLIB += $(NAN_MXTEXTTOOLS)
+#    PYLIB += $(NAN_MXTEXTTOOLS)
 endif
 
 ifeq ($(OS),openbsd)
@@ -549,32 +552,47 @@
     plugin: $(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT)
 endif
 
-$(DIR)/$(DEBUG_DIR)blendercreator$(EXT): $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB)
+$(DIR)/$(DEBUG_DIR)blendercreator$(EXT): $(OBJS) $(GRCLIB) \
+  $(COMLIB2) $(COMLIB) $(BCLIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
-	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB2) \
+	$(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
 
-$(DIR)/$(DEBUG_DIR)blenderstatic: $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB)
+$(DIR)/$(DEBUG_DIR)blenderstatic: $(OBJS) $(GRCLIB) \
+  $(COMLIB2) $(COMLIB) $(BCLIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
-	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
+	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB2) \
+	  $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
 
-$(DIR)/$(DEBUG_DIR)blenderpublisher$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB)
+$(DIR)/$(DEBUG_DIR)blenderpublisher$(EXT): $(OBJS) $(GRPLIB) \
+  $(COMLIB2) $(COMLIB) $(PULIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
-	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB2) \
+	$(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
@@ -582,9 +600,13 @@
 $(DIR)/$(DEBUG_DIR)blenderplayer$(EXT): $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
-	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) \
+	  $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
@@ -592,9 +614,13 @@
 $(DIR)/$(DEBUG_DIR)blenderdynplayer$(EXT): $(OBJS) $(COMLIB) $(SPLIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
-	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) \
+	  $(SPLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
@@ -603,7 +629,10 @@
 $(DIR)/$(DEBUG_DIR)Blender3DPlugin$(SOEXT): $(PLUGAPPLIB_XPLINK)
 	@echo "****> Link $(DIR)/$(DEBUG_DIR)Blender3DPlugin.so"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
 	$(CCC) $(DYNLDFLAGS) -o $@ $(PLUGAPPLIB_XPLINK) $(LOPTS)
     ifdef NAN_BUILDINFO
@@ -612,30 +641,41 @@
 endif
 
 # Windows build needs a def file? Why? For exposing functions from the
-# dll to the outside world. However, this is alsi done internally..
+# dll to the outside world. However, this is also done internally..
 DEFFILE = \\\\server\\nzc\\develop\\source\\gameengine\\GamePlayer\\netscape\\src\\npB3DPlg.def
 
 # Windows needs a specific name format for dll.s so we give it one.
 ifeq ($(OS),windows)
-$(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB)
+$(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB2) $(COMLIB) $(SPLIB)
 	@echo "****> Link $(DIR)/$(DEBUG_DIR)npBl3DPlg.$(SOEXT)"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
-    endif
-#	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) 
-	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) /def:$(DEFFILE)
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
+    endif
+# added /def:$(DEFFILE)
+	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB2) \
+	  $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) \
+	  $(LOPTS) /def:$(DEFFILE)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
 endif
 
 ifeq ($(OS),$(findstring $(OS), "linux freebsd irix solaris"))
-$(DIR)/$(DEBUG_DIR)npBlender3DPlugin$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB)
+$(DIR)/$(DEBUG_DIR)npBlender3DPlugin$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) \
+  $(COMLIB2) $(COMLIB) $(SPLIB)
 	@echo "****> Link $(DIR)/$(DEBUG_DIR)Blender3DPlugin.so"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
-    endif
-	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
+    endif
+	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) \
+	  $(COMLIB2) $(COMLIB) \
+	  $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
@@ -643,20 +683,30 @@
 $(DIR)/$(DEBUG_DIR)npTestPlugin$(SOEXT): $(NSPLUGLIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
     endif
-	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGTESTLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGTESTLIB) $(LLIBS) \
+	  $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif
 endif
 
-$(DIR)/$(DEBUG_DIR)libblenderssr$(SOEXT): $(OBJS) $(SSRLIB1) $(COMLIB) $(SPLIB) $(SSRLIB)
+$(DIR)/$(DEBUG_DIR)libblenderssr$(SOEXT): $(OBJS) $(SSRLIB1) \
+  $(COMLIB2) $(COMLIB) $(SPLIB) $(SSRLIB)
 	@echo "****> Link $@"
     ifdef NAN_BUILDINFO
-	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
-    endif
-	$(CCC) $(DYNLDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SSRLIB) $(SSRLIB1) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS)
+	$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' \
+	  -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' \
+	  -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) \
+	  -DNAN_BUILDINFO
+    endif
+	$(CCC) $(DYNLDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SSRLIB) \
+	  $(SSRLIB1) $(COMLIB2) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) \
+	  $(DADD) $(LOPTS)
     ifdef NAN_BUILDINFO
 	/bin/rm $(BUILDINFO_O)
     endif

--------------0EC51BB93EF3364A77F4C7FD--