[Roadmap-commit] roadmap/src config.mk,1.33,1.34

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24616

Modified Files:
	config.mk 
Log Message:
make config.mk uniform with respect to using conditionals, or comments.


Index: config.mk
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/config.mk,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** config.mk	7 Oct 2008 00:42:20 -0000	1.33
--- config.mk	5 Nov 2008 13:52:02 -0000	1.34
***************
*** 31,55 ****
  # DESKTOP = IPHONE
  
  # If you select WINCE for your WinCE device, you'll need the
! # arm-wince-mingw32ce cross-compiler.  Support for WINCE is
! # still a work in progress.
! ifeq ($(DESKTOP), WINCE)
! CROSS=arm-mingw32ce-
! CFLAGS += -I/opt/wince/include
! LIBS += -L/opt/wince/lib
! endif
  
  # If you select IPHONE for your iPhone or iPod Touch, you'll
  # need the arm-apple-darwin cross-compiler. 
! # The following settings work for at least one iPhone. :-)
! ifeq ($(DESKTOP), IPHONE)
! #CROSS=/usr/local/bin/arm-apple-darwin-
! #CFLAGS += -I/path/to/expat/include
! #LIBS += -L/path/to/libexpat.a
! #ROADMAP_CONFIG_DIR = /Applications/RoadMap.app/resources/
! #ROADMAP_MAP_DIR = $(ROADMAP_CONFIG_DIR)/maps/...
! #INSTALLDIR = Applications/RoadMap.app
! #DESTDIR = /tmp
! endif
  
  # If you selected QT or QPE above, you might also want to set QTDIR
--- 31,52 ----
  # DESKTOP = IPHONE
  
+ # Support for WINCE is still a work in progress.
  # If you select WINCE for your WinCE device, you'll need the
! # arm-wince-mingw32ce cross-compiler.  Uncomment these 3
! # lines and adjust the paths.
! # CROSS=arm-mingw32ce-
! # CFLAGS += -I/opt/wince/include
! # LIBS += -L/opt/wince/lib
  
  # If you select IPHONE for your iPhone or iPod Touch, you'll
  # need the arm-apple-darwin cross-compiler. 
! # The following settings are a starting point, but may need adjustment:
! # CROSS=/usr/local/bin/arm-apple-darwin-
! # CFLAGS += -I/path/to/expat/include
! # LIBS += -L/path/to/libexpat.a
! # ROADMAP_CONFIG_DIR = /Applications/RoadMap.app/resources/
! # ROADMAP_MAP_DIR = $(ROADMAP_CONFIG_DIR)/maps/...
! # INSTALLDIR = Applications/RoadMap.app
! # DESTDIR = /tmp
  
  # If you selected QT or QPE above, you might also want to set QTDIR
***************
*** 148,153 ****
  # Basic building mode
  MODE =		# blank for "normal" build
! # MODE=DEBUG	# enables -g, disables -O, turns on mtrace leak detection
  # MODE=PROFILE	# sets up for profiling with gprof
  
  # You can add any other special local CFLAGS values here
--- 145,151 ----
  # Basic building mode
  MODE =		# blank for "normal" build
! # MODE=DEBUG	# enables -g, disables -O
  # MODE=PROFILE	# sets up for profiling with gprof
+ # CFLAGS += -DROADMAP_MTRACE  # enable mtrace leak detection
  
  # You can add any other special local CFLAGS values here