enable multilingual support on linux and os x using the original Makefiles
[blender.git] / source / Makefile
index ef7a2aa73c126239701fa588c4a8a40d7844aae1..97f149ae52607651a59eb4979369df56d40e5e45 100644 (file)
@@ -38,24 +38,12 @@ endif
 
 include nan_definitions.mk
 
-DIRS = creator blender kernel sumo gameengine
+DIRS = creator blender kernel gameengine
 
 ifeq ($(OS),windows)
     DIRS += icons
 endif
 
-ifeq ($(OS),solaris)
-  ifeq ($(CPU),sparc)
-    DIRS += ssr
-  endif
-endif
-
-ifeq ($(OS),freebsd)
-  ifeq ($(OS_VERSION),4.5)
-    DIRS += ssr
-  endif
-endif
-
 ########## buildinfo kludge ###################
 CPPFLAGS += -I../Physics/common
 CPPFLAGS += -I../Physics/Dummy
@@ -72,12 +60,10 @@ PYPLAYERLIB ?= $(PYLIB)
 
 ############# libraries ##################
 # COMLIB COMmon LIBraries for all targets
-# BCLIB Blender Creator LIBraries
 # BPLIB Browser Plugin LIBraries
 # SPLIB1 Standalone Player LIBraries (pre COMLIB)
 # SPLIB Standalone Player LIBraries (post COMLIB)
 # PULIB PUblisher LIBraries
-# GRCLIB Gui and Render LIBraries for Creator
 # GRPLIB Gui and Render LIBraries for Publisher
 # LLIBS dynamic system libraries
 # SADD Static OpenGL libraries
@@ -86,23 +72,8 @@ PYPLAYERLIB ?= $(PYLIB)
 # PLUGAPPLIB libs that form the application to be plugged in
 # Note: the order is important here
 
-    GRCLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a
-    GRCLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrccreator.a
-    GRCLIB += $(OCGDIR)/blender/misc/$(DEBUG_DIR)libmisc.a
-    GRCLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
-    GRCLIB += $(NAN_DECIMATION)/lib/libdecimation.a
-    GRCLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
-    GRCLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
-    GRCLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
-    GRCLIB += $(OCGDIR)/blender/img/$(DEBUG_DIR)libimg.a
-    GRCLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a
-    GRCLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
-    GRCLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libbpython.a
-    GRCLIB += $(NAN_PYTHON)/frozen/libfrozen.a
-
     GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a
     GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a
-    GRPLIB += $(OCGDIR)/blender/misc/$(DEBUG_DIR)libmisc.a
     GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
     GRPLIB += $(NAN_DECIMATION)/lib/libdecimation.a
     GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
@@ -112,8 +83,13 @@ PYPLAYERLIB ?= $(PYLIB)
     GRPLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a
     GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
     GRPLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libbpython.a
-    GRPLIB += $(NAN_PYTHON)/frozen/libfrozen.a
+    GRPLIB +=  $(OCGDIR)/blender/bpython/libfrozen.a
 
+# nlin: the reason that some libraries appear more than once below is
+# to handle circular dependencies in linking among libraries... some
+# linkers (e.g. under Linux) need libs to be specified multiple times
+# to properly resolve circular dependencies. ugly, but it works...
+# 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
@@ -124,10 +100,20 @@ PYPLAYERLIB ?= $(PYLIB)
     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/sumo/$(DEBUG_DIR)libsumo.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
+    COMLIB += $(NAN_ODE)/lib/libode.a
+#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
+#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
+    COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
+#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
+#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
     COMLIB += $(OCGDIR)/gameengine/logic/$(DEBUG_DIR)liblogic.a
@@ -135,7 +121,7 @@ PYPLAYERLIB ?= $(PYLIB)
     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)/sumo/$(DEBUG_DIR)libfuzzics.a
+#    COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libfuzzics.a
 #    COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libsolid.a
     COMLIB += $(NAN_MOTO)/lib/libmoto.a
     COMLIB += $(NAN_SND_LIBS)
@@ -147,17 +133,34 @@ PYPLAYERLIB ?= $(PYLIB)
     COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
     COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
     COMLIB += $(NAN_PNG)/lib/libpng.a
-
-    BCLIB = $(NAN_IKSOLVER)/lib/libiksolver.a
-    BCLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
-    BCLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
-    BCLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
-    BCLIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a
-    BCLIB += $(OCGDIR)/blender/verify/$(DEBUG_DIR)libverify.a
-    BCLIB += $(OCGDIR)/blender/decryptSTUB/$(DEBUG_DIR)libdecryptSTUB.a
-    BCLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrccreator.a
+  ifeq ($(WITH_QUICKTIME), true)
+    COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
+  endif
+ifeq ($(INTERNATIONAL), true)
+    COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
+    ifeq ($(OS), windows)
+        ifeq ($(FREE_WINDOWS), true)
+          COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
+          COMLIB += $(NAN_FTGL)/lib/libftgl.a
+          COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+          COMLIB += $(NAN_ICONV)/lib/freeiconv.a
+        else
+          COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
+          COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
+          COMLIB += $(NAN_FREETYPE)/lib/freetype211ST.lib
+          COMLIB += $(NAN_ICONV)/lib/iconv.lib
+        endif
+    else
+        COMLIB += $(NAN_FTGL)/lib/libftgl.a
+        COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+    endif
+       ifeq ($(OS), darwin)
+           COMLIB += $(NAN_GETTEXT)/lib/libintl.a
+       endif
+endif
 
     PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+    PULIB += $(NAN_MOTO)/lib/libmoto.a
     PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     PULIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
     PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
@@ -181,11 +184,6 @@ PYPLAYERLIB ?= $(PYLIB)
     SPLIB1 += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
     SPLIB1 += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
 
-    SSRLIB1 = $(OCGDIR)/gameengine/GamePlayer/common/$(DEBUG_DIR)libcommon.a
-    SSRLIB1 += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
-    SSRLIB1 += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
-    SSRLIB1 += $(NAN_PNG)/lib/libpng.a
-
     SPLIB = $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)DNA.o
     SPLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     SPLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
@@ -198,15 +196,12 @@ PYPLAYERLIB ?= $(PYLIB)
     SPLIB += $(OCGDIR)/blender/verify/$(DEBUG_DIR)libverify.a
     SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a
 
-    BCLIB += $(NAN_BLENKEY)/lib/libblenkey.a
     PULIB += $(NAN_BLENKEY)/lib/libblenkey.a
     SPLIB += $(NAN_BLENKEY)/lib/libblenkey.a
   ifeq ($(OS),windows)
-    BCLIB += $(NAN_OPENSSL)/lib/libeay32.lib
     PULIB += $(NAN_OPENSSL)/lib/libeay32.lib
     SPLIB += $(NAN_OPENSSL)/lib/libeay32.lib
   else
-    BCLIB += $(NAN_OPENSSL)/lib/libcrypto.a
     PULIB += $(NAN_OPENSSL)/lib/libcrypto.a
     SPLIB += $(NAN_OPENSSL)/lib/libcrypto.a
   endif
@@ -259,76 +254,63 @@ else
     PLUGREMLIB += $(NAN_OPENSSL)/lib/libcrypto.a
 endif
 
-    SSRLIB  = $(OCGDIR)/ssr/$(DEBUG_DIR)GPG_Application.o
-    SSRLIB += $(OCGDIR)/ssr/$(DEBUG_DIR)GPG_Canvas.o
-    SSRLIB += $(OCGDIR)/ssr/$(DEBUG_DIR)GPG_KeyboardDevice.o
-    SSRLIB += $(OCGDIR)/ssr/$(DEBUG_DIR)GPG_System.o
-    SSRLIB += $(OCGDIR)/ssr/$(DEBUG_DIR)GPG_ghost.o
-    SSRLIB += $(OCGDIR)/ssr/$(DEBUG_DIR)createPngFromGL.o
-
 ######################## OS dependencies (alphabetic!) ################
 
 include nan_link.mk
 
 ifeq ($(OS),beos)
-    BINTARGETS = blendercreator
+    BINTARGETS = blenderdynamic
 endif
 
 ifeq ($(OS),darwin)
-    # Python
-    PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    # The only target right now...
-    BINTARGETS = blendercreator.app
-    BINTARGETS += blenderpublisher.app
+    BINTARGETS = blenderdynamic.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
+    # PYLIB += $(NAN_MXTEXTTOOLS) 
 endif
 
 ifeq ($(OS),freebsd)
   ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
-    BINTARGETS = blendercreator blenderstatic
+    BINTARGETS = blenderdynamic
+    BINTARGETS += blenderstatic
   else
-    BINTARGETS = blendercreator
-    BINTARGETS += blenderpublisher
+    BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
     BINTARGETS += plugin
-  ifeq ($(OS_VERSION),4.5)
-    BINTARGETS += blenderssr
-  endif
   endif
     PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
+    PYLIB += $(NAN_MXTEXTTOOLS) 
 endif
 
 ifeq ($(OS),irix)
-    BINTARGETS = blendercreator
-    BINTARGETS += blenderpublisher
+    BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
     BINTARGETS += plugin
     PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
+    PYLIB += $(NAN_MXTEXTTOOLS)
 endif
 
 ifeq ($(OS),linux)
   ifeq ($(CPU),alpha)
-    BINTARGETS = blendercreator
-    BINTARGETS += blenderpublisher
+    BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
   endif
   ifeq ($(CPU),i386)
     BINTARGETS = plugin
     # BINTARGETS += ptest
     BINTARGETS += xplink
-    BINTARGETS += blendercreator
-    BINTARGETS += blenderpublisher
+    BINTARGETS += blenderdynamic
     BINTARGETS += blenderplayer
     BINTARGETS += blenderstatic
   endif
   ifeq ($(CPU),powerpc)
-    BINTARGETS = blendercreator blenderstatic
-    BINTARGETS += blenderpublisher
+    BINTARGETS = blenderdynamic
+    BINTARGETS += blenderstatic
   endif
     PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
+    PYLIB += $(NAN_MXTEXTTOOLS)
 endif
 
 ifeq ($(OS),openbsd)
@@ -337,18 +319,15 @@ ifeq ($(OS),openbsd)
 endif
 
 ifeq ($(OS),solaris)
-    BINTARGETS = blendercreator
-    BINTARGETS += blenderpublisher
+    BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
   ifeq ($(CPU),sparc)
     BINTARGETS += plugin
-    BINTARGETS += blenderssr
   endif
     PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
+    PYLIB += $(NAN_MXTEXTTOOLS)
     PYLIB += $(NAN_ZLIB)/lib/libz.a
 
-    BCLIB += $(NAN_ZLIB)/lib/libz.a
     PULIB += $(NAN_ZLIB)/lib/libz.a
     SPLIB += $(NAN_ZLIB)/lib/libz.a
 endif
@@ -358,57 +337,63 @@ endif
 ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
   ifeq ($(CPU),i386)
     ifeq ($(OS),freebsd)
+      NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
+      NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+    else
      NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
      NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
      NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
      NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
-     NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
-    else
-     NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
-     NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
-    NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
-    NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
 #     NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
 #     NAN_SND_LIBS += $(NAN_FMOD)/lib/libfmod.a
 #     NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
      NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
     endif
   else
-   ifeq ($(OS),windows)
+    ifeq ($(OS),windows)
+      NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
+      NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
+#      NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
+#      NAN_SND_LIBS += $(NAN_FMOD)/lib/fmodvc.lib
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+    else
+      NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
+      NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+    endif
+  endif
+else
+  ifeq ($(OS),darwin)
     NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
     NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
-#    NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
-#    NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
-    NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
-    NAN_SND_LIBS += $(NAN_FMOD)/lib/fmodvc.lib
+#    NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a
+#    NAN_SND_LIBS += $(NAN_FMOD)/lib/libfmod.a
     NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
-   else
+  else
     NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
     NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
     NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
-   endif
   endif
-else
-    NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
-    NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
-    NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
 endif
 
 ifeq ($(OS),windows)
-    PYLIB = $(NAN_PYTHON)/lib/python20.lib
+    PYLIB = $(NAN_PYTHON)/lib/python22.lib
     PYPLAYERLIB = $(NAN_PYTHON)/static/*.obj
     PYPLAYERLIB = $(PYLIB)
 
+    # Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib
     NSPLUGLIB += $(NAN_NSPR)/lib/nspr4.lib
 
-    BINTARGETS = blendercreator
-    BINTARGETS += blenderpublisher
+    BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
     BINTARGETS += blenderdynplayer
     BINTARGETS += plugin
 
-    BCLIB += $(OCGDIR)/blender/icons/$(DEBUG_DIR)wincreator.res
-    BCLIB += $(NAN_ZLIB)/lib/libz.a
     PULIB += $(OCGDIR)/blender/icons/$(DEBUG_DIR)winpublisher.res
     PULIB += $(NAN_ZLIB)/lib/libz.a
     SPLIB += $(OCGDIR)/blender/icons/$(DEBUG_DIR)winplayer.res
@@ -477,16 +462,14 @@ link: $(BINTARGETS)
     endif
 
 linkclean:
-       @$(RM)  $(DIR)/blendercreator* \
-               $(DIR)/blenderstatic* \
-               $(DIR)/blenderpublisher* \
-               $(DIR)/blenderplayer*
+       @$(RM) $(DIR)/blenderstatic* \
+               $(DIR)/blenderplayer* \
+               $(DIR)/bin/*
 
 debuglinkclean:
-       @$(RM)  $(DIR)/debug/blendercreator* \
-               $(DIR)/debug/blenderstatic* \
-               $(DIR)/debug/blenderpublisher* \
-               $(DIR)/debug/blenderplayer*
+       @$(RM) $(DIR)/debug/blenderstatic* \
+               $(DIR)/debug/blenderplayer* \
+               $(DIR)/debug/bin/*
 
 # Shortcut for Tinderbox release builds. Mortals don't use this.
 release:
@@ -494,21 +477,16 @@ release:
 
 ############### Linker rules ###############
 
-blendercreator: $(DIR)/$(DEBUG_DIR)blendercreator$(EXT)
 blenderstatic: $(DIR)/$(DEBUG_DIR)blenderstatic
-blenderpublisher: $(DIR)/$(DEBUG_DIR)blenderpublisher$(EXT)
+blenderdynamic: $(DIR)/$(DEBUG_DIR)blenderdynamic$(EXT)
 blenderplayer: $(DIR)/$(DEBUG_DIR)blenderplayer$(EXT)
 blenderdynplayer: $(DIR)/$(DEBUG_DIR)blenderdynplayer$(EXT)
-blenderssr: $(DIR)/$(DEBUG_DIR)libblenderssr$(SOEXT)
 
 blenderplayer.app: blenderplayer
        @$(MAKE) -C darwin/ APPLICATION=blenderplayer
 
-blenderpublisher.app: blenderpublisher
-       @$(MAKE) -C darwin/ APPLICATION=blenderpublisher
-
-blendercreator.app: blendercreator
-       @$(MAKE) -C darwin/ APPLICATION=blendercreator
+blenderdynamic.app: blenderdynamic
+       @$(MAKE) -C darwin/ APPLICATION=blender
 
 # XPCOM connector only for linux so far...
 ifeq ($(OS),linux)
@@ -525,32 +503,24 @@ ifeq ($(OS),windows)
     plugin: $(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT)
 endif
 
-$(DIR)/$(DEBUG_DIR)blendercreator$(EXT): $(OBJS) $(GRCLIB) $(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
-    endif
-       $(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(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) $(GRPLIB) $(COMLIB) $(PULIB)
        @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
     endif
-       $(CCC) $(LDFLAGS) -o $@ $(BUILDINFO_O) $(OBJS) $(GRCLIB) $(COMLIB) $(BCLIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
+       mkdir -p $(DIR)/$(DEBUG_DIR)bin
+       $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
     ifdef NAN_BUILDINFO
        /bin/rm $(BUILDINFO_O)
     endif
 
-$(DIR)/$(DEBUG_DIR)blenderpublisher$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB)
+$(DIR)/$(DEBUG_DIR)blenderdynamic$(EXT): $(OBJS) $(GRPLIB) $(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
     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
@@ -560,7 +530,8 @@ $(DIR)/$(DEBUG_DIR)blenderplayer$(EXT): $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB)
     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
@@ -570,7 +541,8 @@ $(DIR)/$(DEBUG_DIR)blenderdynplayer$(EXT): $(OBJS) $(COMLIB) $(SPLIB)
     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
@@ -589,7 +561,7 @@ endif
 
 # Windows build needs a def file? Why? For exposing functions from the
 # dll to the outside world. However, this is alsi done internally..
-DEFFILE = \\\\server\\nzc\\develop\\source\\gameengine\\GamePlayer\\netscape\\src\\npB3DPlg.def
+DEFFILE = ./gameengine/GamePlayer/netscape/src/npB3DPlg.def
 
 # Windows needs a specific name format for dll.s so we give it one.
 ifeq ($(OS),windows)
@@ -626,14 +598,3 @@ $(DIR)/$(DEBUG_DIR)npTestPlugin$(SOEXT): $(NSPLUGLIB)
        /bin/rm $(BUILDINFO_O)
     endif
 endif
-
-$(DIR)/$(DEBUG_DIR)libblenderssr$(SOEXT): $(OBJS) $(SSRLIB1) $(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)
-    ifdef NAN_BUILDINFO
-       /bin/rm $(BUILDINFO_O)
-    endif
-