[Tinyos-2-commits] CVS: tinyos-2.x/support/make sim-fast.extra, 1.6, 1.7

[Phil Levis]

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

Modified Files:
	sim-fast.extra 
Log Message:
Incorporate probing in sim-fast.


Index: sim-fast.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/sim-fast.extra,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sim-fast.extra	1 Apr 2007 00:25:07 -0000	1.6
--- sim-fast.extra	21 Apr 2007 04:53:11 -0000	1.7
***************
*** 6,10 ****
  OPTFLAGS = -g -O3
  LIBS = -lm -lstdc++ 
! PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\)   -DTOSSIM_NO_DEBUG
  WFLAGS = -Wno-nesc-data-race
  PYTHON_VERSION=2.3
--- 6,10 ----
  OPTFLAGS = -g -O3
  LIBS = -lm -lstdc++ 
! PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\) -DTOSSIM_NO_DEBUG
  WFLAGS = -Wno-nesc-data-race
  PYTHON_VERSION=2.3
***************
*** 24,34 ****
  DUMPTYPES = -fnesc-dump=components -fnesc-dump=variables -fnesc-dump=constants -fnesc-dump=typedefs -fnesc-dump=interfacedefs -fnesc-dump=tags
  
! ifeq ($(OSTYPE), cygwin)
    PLATFORM_FLAGS=-DUSE_DL_IMPORT -fpic
    SHARED_OBJECT=_TOSSIM.dll
    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
--- 24,40 ----
  DUMPTYPES = -fnesc-dump=components -fnesc-dump=variables -fnesc-dump=constants -fnesc-dump=typedefs -fnesc-dump=interfacedefs -fnesc-dump=tags
  
! ifeq ($(findstring cygwin, $(OSTYPE)),cygwin)
    PLATFORM_FLAGS=-DUSE_DL_IMPORT -fpic
    SHARED_OBJECT=_TOSSIM.dll
    PLATFORM_BUILD_FLAGS= -fpic -W1,--enabled-auto-image-base 
!   PLATFORM_LIB_FLAGS = -L/usr/lib/python$(PYTHON_VERSION)/config -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
  else 
! ifeq ($(OS),Windows_NT) # Some TinyOS installs are like this
!   PLATFORM_FLAGS=-DUSE_DL_IMPORT -fpic
!   SHARED_OBJECT=_TOSSIM.dll
!   PLATFORM_BUILD_FLAGS= -fpic -W1,--enabled-auto-image-base 
!   PLATFORM_LIB_FLAGS = -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
***************
*** 43,46 ****
--- 49,53 ----
  endif
  endif
+ endif
   
  BUILD_DEPS = sim-exe
***************
*** 54,57 ****
--- 61,65 ----
  	@echo "  compiling $(COMPONENT) to object file sim.o"
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
+ 
  	@echo "  compiling Python support and C libraries into pytossim.o, tossim.o, and c-support.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H