diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-07-10 13:49:49 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-07-10 13:49:49 +0000 |
| commit | 57613ea5fafb8ba4555755074e7d6ad768fb8a68 (patch) | |
| tree | 7e0d15688e3cf69718e2640eb6bf7b1a1e8c7661 /apps/codecs | |
| parent | e87ff2bf91b65d51f41f7db4df3632a30748002d (diff) | |
| download | rockbox-57613ea5fafb8ba4555755074e7d6ad768fb8a68.zip rockbox-57613ea5fafb8ba4555755074e7d6ad768fb8a68.tar.gz rockbox-57613ea5fafb8ba4555755074e7d6ad768fb8a68.tar.bz2 rockbox-57613ea5fafb8ba4555755074e7d6ad768fb8a68.tar.xz | |
Rename/change SIMVER to APP_TYPE in the Makefiles.
SIMVER was really only used to detect a simulator build. With APP_TYPE you can
now differentiate between simulator, application, checkwps and database builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27372 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
| -rw-r--r-- | apps/codecs/codecs.make | 6 | ||||
| -rw-r--r-- | apps/codecs/lib/tlsf/libtlsf.make | 2 | ||||
| -rw-r--r-- | apps/codecs/libwmapro/libwmapro.make | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index aab23b0..c137426 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make @@ -47,7 +47,7 @@ include $(APPSDIR)/codecs/libtta/libtta.make CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ -I$(APPSDIR)/codecs/lib -DCODEC -ifndef SIMVER +ifndef APP_TYPE CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file CODECLINK_LDS := $(CODECDIR)/codec.link @@ -115,7 +115,7 @@ $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ -I$(dir $<) $(CODECFLAGS) -c $< -o $@ -ifdef SIMVER +ifdef APP_TYPE CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile else CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map @@ -135,7 +135,7 @@ $(CODECDIR)/%.codec: $(CODECDIR)/%.o $(filter %.o, $^) \ $(filter %.a, $+) \ -lgcc $(CODECLDFLAGS) -ifdef SIMVER +ifdef APP_TYPE $(SILENT)cp $(CODECDIR)/$*.elf $@ else $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ diff --git a/apps/codecs/lib/tlsf/libtlsf.make b/apps/codecs/lib/tlsf/libtlsf.make index 464487f..7d37d29 100644 --- a/apps/codecs/lib/tlsf/libtlsf.make +++ b/apps/codecs/lib/tlsf/libtlsf.make @@ -18,7 +18,7 @@ $(TLSFLIB): $(TLSFLIB_OBJ) TLSFLIBFLAGS = $(CODECFLAGS) -ffunction-sections -ifdef SIMVER +ifdef APP_TYPE TLSFLIBFLAGS += -DTLSF_STATISTIC=1 endif diff --git a/apps/codecs/libwmapro/libwmapro.make b/apps/codecs/libwmapro/libwmapro.make index 42086a6..0e8df7e 100644 --- a/apps/codecs/libwmapro/libwmapro.make +++ b/apps/codecs/libwmapro/libwmapro.make @@ -17,7 +17,7 @@ $(WMAPROLIB): $(WMAPROLIB_OBJ) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -ifdef SIMVER +ifdef APP_TYPE # wmapro needs libm in the simulator $(CODECDIR)/wmapro.codec: $(CODECDIR)/wmapro.o $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/wmapro.elf \ |