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

[Kevin Klues]

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

Modified Files:
	sim.extra 
Log Message:
Update to work with some versions of darwin on mac os

Index: sim.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/sim.extra,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sim.extra	21 Apr 2007 07:00:30 -0000	1.8
--- sim.extra	25 Feb 2008 18:24:38 -0000	1.9
***************
*** 36,45 ****
    PLATFORM_LIB_FLAGS =-shared -L/usr/lib/python$(PYTHON_VERSION)/config -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
  else 
! ifeq ($(findstring darwin, $(OSTYPE)), darwin)
!   PLATFORM_FLAGS=-fPIC
!   PLATFORM_CC_FLAGS=-bundle
!   SHARED_OBJECT=_TOSSIMmodule.so
!   PLATFORM_BUILD_FLAGS=-flat_namespace -undefined suppress 
!   PLATFORM_LIB_FLAGS = -lstdc++ 
  else # linux
    PLATFORM_FLAGS=-shared -fPIC
--- 36,44 ----
    PLATFORM_LIB_FLAGS =-shared -L/usr/lib/python$(PYTHON_VERSION)/config -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
  else 
! ifeq ($(findstring darwin, $(OSTYPE)), darwin) 
!   SIM_DARWIN=TRUE
! else
! ifeq ($(findstring Darwin, $(shell uname)), Darwin)
!   SIM_DARWIN = TRUE  
  else # linux
    PLATFORM_FLAGS=-shared -fPIC
***************
*** 50,54 ****
  endif
  endif
!  
  BUILD_DEPS = sim-exe
  
--- 49,61 ----
  endif
  endif
! endif 
! ifdef SIM_DARWIN
!   PLATFORM_FLAGS=-fPIC
!   PLATFORM_CC_FLAGS=-bundle
!   SHARED_OBJECT=_TOSSIMmodule.so
!   PLATFORM_BUILD_FLAGS=-flat_namespace -undefined suppress 
!   PLATFORM_LIB_FLAGS = -lstdc++ 
! endif 
! 
  BUILD_DEPS = sim-exe