Fixing up the webplugin defines for the Makefiles.
authorKent Mein <mein@cs.umn.edu>
Thu, 8 May 2008 18:38:21 +0000 (18:38 +0000)
committerKent Mein <mein@cs.umn.edu>
Thu, 8 May 2008 18:38:21 +0000 (18:38 +0000)
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

source/Makefile
source/gameengine/GamePlayer/Makefile
source/nan_definitions.mk

index e5dffbf532d4aa5120849e104aa3ee6a580a397a..5ebff3bbbf5b8e9026fcb1542f5980bf37b7c0c0 100644 (file)
@@ -315,12 +315,10 @@ ifeq ($(WITH_BF_BLENDERPLAYER), true)
 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
index 747a82fc3336504bcdb74b412d539186e0da5892..c4f78f2311791acf8af93e652f2c9177ea1b4b26 100644 (file)
@@ -34,7 +34,7 @@ SOURCEDIR = source/gameengine/GamePlayer
 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
index 43345817f2e627539eed5a3987fc973bb46ce20f..e19d10dba641dc0d1651adc1f828d0a4342c8e03 100644 (file)
@@ -64,7 +64,11 @@ all debug::
     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)