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