[Bf-committers] Unifying creator and publisher
Kent Mein
bf-committers@blender.org
Wed, 29 Jan 2003 10:21:48 -0600
--fdj2RfSjLxBAspz7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Ok here is my diff for merging publisher and creator.
(Its a cvs diff of blender/source/Makefile)
It still needs a bit of work, so I haven't committed it.
What needs to be done:
The MacosX stuff. Didn't know enough about apps on MacosX to fix it.
Make it similar on windows/unix/MacosX.
The blenderstatic target should probably be updated as well.
Alter tinderbox to find the binaries since they have moved slightly.
What it basically does.
Doesn't build the creator target on any platforms by default.
Builds publisher but the binary is renamed to just blender.
When compiling bins it sticks them in obj/(platform)/bin
instead of just obj/(platform) because there is a obj/(platform)/blender
directory which gets in the way on some systems.
Kent
--
mein@cs.umn.edu
http://www.cs.umn.edu/~mein
--fdj2RfSjLxBAspz7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.diff"
Index: Makefile
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 14 Jan 2003 19:08:56 -0000 1.25
+++ Makefile 29 Jan 2003 16:10:54 -0000
@@ -268,24 +268,23 @@
include nan_link.mk
ifeq ($(OS),beos)
- BINTARGETS = blendercreator
+ BINTARGETS = blenderpublisher
endif
ifeq ($(OS),darwin)
+ BINTARGETS = blenderpublisher.app
+ BINTARGETS += blenderplayer.app
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
- # Next line would enable MxTextTools (for VRML2 import) but results in a link error
+ # Next line would enable MxTextTools (for VRML2 import)
+ # but results in a link error
# PYLIB += $(NAN_MXTEXTTOOLS)
- BINTARGETS = blendercreator.app
- BINTARGETS += blenderpublisher.app
- BINTARGETS += blenderplayer.app
endif
ifeq ($(OS),freebsd)
ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
- BINTARGETS = blendercreator blenderstatic
+ BINTARGETS = blenderstatic
else
- BINTARGETS = blendercreator
- BINTARGETS += blenderpublisher
+ BINTARGETS = blenderpublisher
BINTARGETS += blenderplayer
BINTARGETS += plugin
endif
@@ -294,8 +293,7 @@
endif
ifeq ($(OS),irix)
- BINTARGETS = blendercreator
- BINTARGETS += blenderpublisher
+ BINTARGETS = blenderpublisher
BINTARGETS += blenderplayer
BINTARGETS += plugin
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
@@ -304,21 +302,19 @@
ifeq ($(OS),linux)
ifeq ($(CPU),alpha)
- BINTARGETS = blendercreator
- BINTARGETS += blenderpublisher
+ BINTARGETS = blenderpublisher
BINTARGETS += blenderplayer
endif
ifeq ($(CPU),i386)
BINTARGETS = plugin
# BINTARGETS += ptest
BINTARGETS += xplink
- BINTARGETS += blendercreator
BINTARGETS += blenderpublisher
BINTARGETS += blenderplayer
BINTARGETS += blenderstatic
endif
ifeq ($(CPU),powerpc)
- BINTARGETS = blendercreator blenderstatic
+ BINTARGETS = blenderstatic
BINTARGETS += blenderpublisher
endif
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
@@ -331,8 +327,7 @@
endif
ifeq ($(OS),solaris)
- BINTARGETS = blendercreator
- BINTARGETS += blenderpublisher
+ BINTARGETS = blenderpublisher
BINTARGETS += blenderplayer
ifeq ($(CPU),sparc)
BINTARGETS += plugin
@@ -403,8 +398,7 @@
# Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib
NSPLUGLIB += $(NAN_NSPR)/lib/nspr4.lib
- BINTARGETS = blendercreator
- BINTARGETS += blenderpublisher
+ BINTARGETS = blenderpublisher
BINTARGETS += blenderplayer
BINTARGETS += blenderdynplayer
BINTARGETS += plugin
@@ -479,16 +473,16 @@
endif
linkclean:
- @$(RM) $(DIR)/blendercreator* \
- $(DIR)/blenderstatic* \
+ @$(RM) $(DIR)/blenderstatic* \
$(DIR)/blenderpublisher* \
- $(DIR)/blenderplayer*
+ $(DIR)/blenderplayer* \
+ $(DIR)/bin/*
debuglinkclean:
- @$(RM) $(DIR)/debug/blendercreator* \
- $(DIR)/debug/blenderstatic* \
+ @$(RM) $(DIR)/debug/blenderstatic* \
$(DIR)/debug/blenderpublisher* \
- $(DIR)/debug/blenderplayer*
+ $(DIR)/debug/blenderplayer* \
+ $(DIR)/debug/bin/*
# Shortcut for Tinderbox release builds. Mortals don't use this.
release:
@@ -531,7 +525,8 @@
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) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+ mkdir -p $(DIR)/$(DEBUG_DIR)bin
+ $(CCC) $(LDFLAGS) -o $(DIR)/$DEBUG_DIR)bin/blendercreator$(EXT) $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -541,7 +536,8 @@
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
endif
- $(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
+ mkdir -p $(DIR)/$(DEBUG_DIR)bin
+ $(CCC) $(LDFLAGS) -o $(DKR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -551,7 +547,8 @@
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) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+ mkdir -p $(DIR)/$(DEBUG_DIR)bin
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -561,7 +558,8 @@
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) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS)
+ mkdir -p $(DIR)/$(DEBUG_DIR)bin
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -571,7 +569,8 @@
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) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+ mkdir -p $(DIR)/$(DEBUG_DIR)bin
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -627,4 +626,3 @@
/bin/rm $(BUILDINFO_O)
endif
endif
-
--fdj2RfSjLxBAspz7--