[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14747] trunk/blender/source: Fixing up the webplugin defines for the Makefiles.

[Kent Mein]

Revision: 14747
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14747
Author:   sirdude
Date:     2008-05-08 20:38:21 +0200 (Thu, 08 May 2008)

Log Message:
-----------
Fixing up the webplugin defines for the Makefiles.

Now you can do one of the following to disable it:
export NAN_NO_PLUGIN=true
export WITH_BF_WEBPLUGIN=false

or
export WITH_BF_WEBPLUGIN=true to enable building it.
(Its set to false by default)

Kent

Modified Paths:
--------------
    trunk/blender/source/Makefile
    trunk/blender/source/gameengine/GamePlayer/Makefile
    trunk/blender/source/nan_definitions.mk

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2008-05-08 17:36:08 UTC (rev 14746)
+++ trunk/blender/source/Makefile	2008-05-08 18:38:21 UTC (rev 14747)
@@ -315,12 +315,10 @@
 endif
 
 ifeq ($(WITH_BF_WEBPLUGIN), true)
-    ifneq ($(NAN_NO_PLUGIN), true)
-        BINTARGETS += plugin
-        ifeq ($(OS),linux)
-            ifeq ($(CPU),i386)
-                 BINTARGETS += xplink
-             endif
+    BINTARGETS += plugin
+    ifeq ($(OS),linux)
+        ifeq ($(CPU),i386)
+             BINTARGETS += xplink
         endif
     endif
 endif

Modified: trunk/blender/source/gameengine/GamePlayer/Makefile
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/Makefile	2008-05-08 17:36:08 UTC (rev 14746)
+++ trunk/blender/source/gameengine/GamePlayer/Makefile	2008-05-08 18:38:21 UTC (rev 14747)
@@ -34,7 +34,7 @@
 DIR = $(OCGDIR)/gameengine/GamePlayer
 DIRS = common ghost
 
-ifneq ($(NAN_NO_PLUGIN),true)
+ifeq ($(WITH_BF_WEBPLUGIN),true)
 ifeq ($(OS),$(findstring $(OS), "freebsd irix windows"))
 	ifneq ($(FREE_WINDOWS),true)
 	    DIRS += netscape

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2008-05-08 17:36:08 UTC (rev 14746)
+++ trunk/blender/source/nan_definitions.mk	2008-05-08 18:38:21 UTC (rev 14747)
@@ -64,7 +64,11 @@
     export WITH_BF_STATICOPENGL ?= false
     export WITH_BF_BLENDERGAMEENGINE ?= true
     export WITH_BF_BLENDERPLAYER ?= true
-    export WITH_BF_WEBPLUGIN ?= false
+    ifeq ($(NAN_NO_PLUGIN), true)
+        export WITH_BF_WEBPLUGIN = false
+    else
+        export WITH_BF_WEBPLUGIN ?= false
+    endif
 
     export NAN_MOTO ?= $(LCGDIR)/moto
 ifeq ($(FREE_WINDOWS), true)