Changeset 1720 for branches/reyalp-ptp-live/makefile.inc

Timestamp:

03/10/12 05:03:38 (15 months ago)

Author:

reyalp

Message:

Merged revision(s) 1714-1719 from trunk

Location:

branches/reyalp-ptp-live

Files:

• . (modified) (1 prop)
• makefile.inc (modified) (3 diffs)

branches/reyalp-ptp-live/makefile.inc

@@ -11 +11 @@
 -include $(topdir)localbuildconf.inc
 include $(topdir)version.inc
+-include $(topdir)revision.inc
 
 ifdef PLATFORM
@@ -133 +134 @@
 CFLAGS+=-mthumb-interwork
 CFLAGS+=-I$(topdir)include -I$(topdir)core -I$(topdir)platform/$(PLATFORM) $(PLFLAGS) $(CPPFLAGS)
-CFLAGS+=-DPLATFORM=\"$(PLATFORM)\" -DPLATFORMSUB=\"$(PLATFORMSUB)\" -DPLATFORMID=$(PLATFORMID) -DHDK_VERSION=\"$(VER)\" -DBUILD_NUMBER=\"$(BUILD_NUMBER)\" -DCAMERA_$(PLATFORM)=1
+CFLAGS+=-DPLATFORM=\"$(PLATFORM)\" -DPLATFORMSUB=\"$(PLATFORMSUB)\" -DPLATFORMID=$(PLATFORMID) -DHDK_VERSION=\"$(VER)\" -DBUILD_NUMBER=\"$(BUILD_NUMBER)\" -DBUILD_SVNREV=\"$(BUILD_SVNREV)\" -DCAMERA_$(PLATFORM)=1
 CFLAGS+=-Wall -Wno-unused -Wno-format
 LDFLAGS=-L$(topdir)lib/math -L$(topdir)lib/font
 LDFLAGS+=-L$(topdir)lib/libc -L$(topdir)lib/ubasic
 LDFLAGS+=-L$(topdir)platform/$(PLATFORM) -L$(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)
+
+ifeq ($(VER),CHDK)
+CFLAGS+=-DVER_CHDK
+else
+CFLAGS+=-DVER_CHDK_DE
+endif
 
 ifdef OPT_DEBUGGING
@@ -278 +285 @@
 $(topdir)localbuildconf.inc: ;
 $(topdir)version.inc: ;
+$(topdir)revision.inc: ;
 $(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc: ;
 $(topdir)platform/fi2.inc: ;