[Tinyos-2-commits] CVS: tinyos-2.x/support/make sim.extra, 1.1.2.4, 1.1.2.5

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/support/make
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24462

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	sim.extra 
Log Message:
OS X support.


Index: sim.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/Attic/sim.extra,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** sim.extra	7 Jun 2006 17:34:04 -0000	1.1.2.4
--- sim.extra	7 Jun 2006 18:02:38 -0000	1.1.2.5
***************
*** 27,34 ****
    PLATFORM_BUILD_FLAGS= -fpic -W1,--enabled-auto-image-base 
    PLATFORM_LIB_FLAGS = -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
! else  # Linux
    PLATFORM_FLAGS=-shared -fPIC
    SHARED_OBJECT=_TOSSIMmodule.so
    PLATFORM_LIB_FLAGS = -lstdc++ 
  endif
   
--- 27,43 ----
    PLATFORM_BUILD_FLAGS= -fpic -W1,--enabled-auto-image-base 
    PLATFORM_LIB_FLAGS = -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
! else 
! ifeq ($(OSTYPE), darwin) 
!   PLATFORM_FLAGS=-fPIC
!   PLATFORM_CC_FLAGS=-bundle
!   SHARED_OBJECT=_TOSSIMmodule.so
!   PLATFORM_BUILD_FLAGS=-flat_namespace -undefined supress 
!   PLATFORM_LIB_FLAGS = -lstdc++ 
! else # linux
    PLATFORM_FLAGS=-shared -fPIC
    SHARED_OBJECT=_TOSSIMmodule.so
    PLATFORM_LIB_FLAGS = -lstdc++ 
+   PLATFORM_BUILD_FLAGS= -shared -fPIC
+ endif
  endif
   
***************
*** 45,52 ****
  
  	@echo "  compiling Python support into pytossim.o and tossim.o"
! 	$(GPP) -c $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
! 	$(GPP) -c $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_FLAGS) $(PLATFORM_BUILD_FLAGS) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .
--- 54,61 ----
  
  	@echo "  compiling Python support into pytossim.o and tossim.o"
! 	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
! 	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .