diff options
author | Kent Mein <mein@cs.umn.edu> | 2002-12-20 22:37:38 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2002-12-20 22:37:38 +0300 |
commit | 0f95aa1622793eb3ed24bb4be894bc28f8bb8b25 (patch) | |
tree | 4d9871fa1c715d17f7680953dba67ed7753186ea | |
parent | e5341714b6404dc8c7ede284a0a9f88f80e52b49 (diff) |
This is sort of a two parter from the mailling list but really its the
same thing:
Added the xpcom include and added a flag to use mozilla vs netscape.
Which basically adds some ifdefs to
_Blender3DPlugin_implementation_.cpp
Basically I modified the nan_definitions.mk in the following way
(You'll need to update yours don't forget) ;)
Also updated the makefiles to use the new vars and flushed them out
so they first include whatever nspr is set to and then look in
NAN_MOZILLA_INC
I wasn't sure what the NAN_MOZILLA_INC and _LIB defaults should be
since were assuming they point to a netscape dir by default (or maybe
old mozilla???)
maybe they should be
export NAN_MOZILLA_INC ?= $(LCGDIR)/netscape/include
export NAN_MOZILLA_LIB ?= $(LCGDIR)/netscape/lib/
instead...
Anyone have any opinions on the defaults?
Kent
--
mein@cs.umn.edu
Index: nan_definitions.mk
===================================================================
RCS file: /cvs01/blender/source/nan_definitions.mk,v
retrieving revision 1.8
diff -u -r1.8 nan_definitions.mk
--- nan_definitions.mk 2002/12/19 21:12:58 1.8
+++ nan_definitions.mk 2002/12/20 19:28:51
@@ -75,7 +75,13 @@
export NAN_TEST_VERBOSITY ?= 1
export NAN_ZLIB ?= $(LCGDIR)/zlib
export NAN_BMFONT ?= $(LCGDIR)/bmfont
- export NAN_MOZILLA ?= $(LCGDIR)/mozilla
+ # Uncomment the following line to use Mozilla inplace of netscape
+ # CPPFLAGS +=-DMOZ_NOT_NET
+ # Location of MOZILLA/Netscape header files...
+ export NAN_MOZILLA_INC ?= $(LCGDIR)/mozilla/include
+ export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
+ # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
+ # if this is not set.
export NAN_NSPR ?= $(LCGDIR)/nspr
-rw-r--r-- | source/Makefile | 1 | ||||
-rw-r--r-- | source/nan_definitions.mk | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index 467b68ce9ed..57a69704953 100644 --- a/source/Makefile +++ b/source/Makefile @@ -428,6 +428,7 @@ ifeq ($(OS),windows) 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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index f9f98caf93d..6b49de0c029 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -75,7 +75,13 @@ all debug:: export NAN_TEST_VERBOSITY ?= 1 export NAN_ZLIB ?= $(LCGDIR)/zlib export NAN_BMFONT ?= $(LCGDIR)/bmfont - export NAN_MOZILLA ?= $(LCGDIR)/mozilla + # Uncomment the following line to use Mozilla inplace of netscape + # CPPFLAGS +=-DMOZ_NOT_NET + # Location of MOZILLA/Netscape header files... + export NAN_MOZILLA_INC ?= $(LCGDIR)/mozilla/include + export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/ + # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB + # if this is not set. export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_BUILDINFO = true |