sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixing up the webplugin defines for the Makefiles.

Browse Source 
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
This commit is contained in:
Kent Mein 2008-05-08 18:38:21 +00:00
parent 8fdc367e0d
commit 106974a9d2
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Makefile
View File

@ -315,14 +315,12 @@ ifeq ($(WITH_BF_BLENDERPLAYER), true)
endif endif
ifeq ($(WITH_BF_WEBPLUGIN), true) ifeq ($(WITH_BF_WEBPLUGIN), true)
ifneq ($(NAN_NO_PLUGIN), true)
BINTARGETS += plugin BINTARGETS += plugin
ifeq ($(OS),linux) ifeq ($(OS),linux)
ifeq ($(CPU),i386) ifeq ($(CPU),i386)
BINTARGETS += xplink BINTARGETS += xplink
endif endif
endif endif
endif
endif endif
ifeq ($(OS),solaris) ifeq ($(OS),solaris)

2
source/gameengine/GamePlayer/Makefile
View File

@ -34,7 +34,7 @@ SOURCEDIR = source/gameengine/GamePlayer
DIR = $(OCGDIR)/gameengine/GamePlayer DIR = $(OCGDIR)/gameengine/GamePlayer
DIRS = common ghost DIRS = common ghost
ifneq ($(NAN_NO_PLUGIN),true) ifeq ($(WITH_BF_WEBPLUGIN),true)
ifeq ($(OS),$(findstring $(OS), "freebsd irix windows")) ifeq ($(OS),$(findstring $(OS), "freebsd irix windows"))
ifneq ($(FREE_WINDOWS),true) ifneq ($(FREE_WINDOWS),true)
DIRS += netscape DIRS += netscape

4
source/nan_definitions.mk
View File

@ -64,7 +64,11 @@ all debug::
export WITH_BF_STATICOPENGL ?= false export WITH_BF_STATICOPENGL ?= false
export WITH_BF_BLENDERGAMEENGINE ?= true export WITH_BF_BLENDERGAMEENGINE ?= true
export WITH_BF_BLENDERPLAYER ?= true export WITH_BF_BLENDERPLAYER ?= true
ifeq ($(NAN_NO_PLUGIN), true)
export WITH_BF_WEBPLUGIN = false
else
export WITH_BF_WEBPLUGIN ?= false export WITH_BF_WEBPLUGIN ?= false
endif
export NAN_MOTO ?= $(LCGDIR)/moto export NAN_MOTO ?= $(LCGDIR)/moto
ifeq ($(FREE_WINDOWS), true) ifeq ($(FREE_WINDOWS), true)