[Bf-committers] CVS commit: blender/source Makefile nan_definitions.mk blender/source/gameengine/GamePlayer/netscape/src Makefile blender/source/gameengine/GamePlayer/netscape/src/ketsji Makefile blender/source/gameengine/GamePlayer/netscape/src/xpcom Makefile _Blender3DPlugin_implementation_.cpp blender/source/gameengine/GamePlayer/netscape/test/colorcycle Makefile ...

Unprivileged User bf-committers@blender.org
Fri, 20 Dec 2002 20:37:38 +0100 (CET)


nobody      2002/12/20 20:37:38 CET

  Modified files:
    blender/source       Makefile nan_definitions.mk 
    blender/source/gameengine/GamePlayer/netscape/src Makefile 
    blender/source/gameengine/GamePlayer/netscape/src/ketsji 
                                                             Makefile 
    blender/source/gameengine/GamePlayer/netscape/src/xpcom 
                                                            Makefile 
                                                            _Blender3DPlugin_implementation_.cpp 
    blender/source/gameengine/GamePlayer/netscape/test/colorcycle 
                                                                  Makefile 
    blender/source/gameengine/GamePlayer/netscape/test/gears 
                                                             Makefile 
    blender/source/gameengine/GamePlayer/netscape/test/stub 
                                                            Makefile 
    blender/source/gameengine/GamePlayer/netscape/test/threaded_gears 
                                                                      Makefile 
  
  Log:
  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
  
  Revision  Changes    Path
  1.16      +2 -1      blender/source/Makefile
  1.9       +8 -2      blender/source/nan_definitions.mk
  1.4       +2 -1      blender/source/gameengine/GamePlayer/netscape/src/Makefile
  1.5       +2 -1      blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
  1.3       +6 -3      blender/source/gameengine/GamePlayer/netscape/src/xpcom/Makefile
  1.4       +15 -1     blender/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp
  1.4       +2 -1      blender/source/gameengine/GamePlayer/netscape/test/colorcycle/Makefile
  1.4       +2 -1      blender/source/gameengine/GamePlayer/netscape/test/gears/Makefile
  1.4       +2 -2      blender/source/gameengine/GamePlayer/netscape/test/stub/Makefile
  1.4       +2 -2      blender/source/gameengine/GamePlayer/netscape/test/threaded_gears/Makefile