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/codecs.make | |
parent | e87ff2bf91b65d51f41f7db4df3632a30748002d (diff) | |
download | rockbox-57613ea5fafb8ba4555755074e7d6ad768fb8a68.tar.gz rockbox-57613ea5fafb8ba4555755074e7d6ad768fb8a68.zip |
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/codecs.make')
-rw-r--r-- | apps/codecs/codecs.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index aab23b01a2..c137426591 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -47,7 +47,7 @@ include $(APPSDIR)/codecs/libtta/libtta.make | |||
47 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ | 47 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ |
48 | -I$(APPSDIR)/codecs/lib -DCODEC | 48 | -I$(APPSDIR)/codecs/lib -DCODEC |
49 | 49 | ||
50 | ifndef SIMVER | 50 | ifndef APP_TYPE |
51 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h | 51 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h |
52 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file | 52 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file |
53 | CODECLINK_LDS := $(CODECDIR)/codec.link | 53 | CODECLINK_LDS := $(CODECDIR)/codec.link |
@@ -115,7 +115,7 @@ $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S | |||
115 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ | 115 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ |
116 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ | 116 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ |
117 | 117 | ||
118 | ifdef SIMVER | 118 | ifdef APP_TYPE |
119 | CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile | 119 | CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile |
120 | else | 120 | else |
121 | CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map | 121 | CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map |
@@ -135,7 +135,7 @@ $(CODECDIR)/%.codec: $(CODECDIR)/%.o | |||
135 | $(filter %.o, $^) \ | 135 | $(filter %.o, $^) \ |
136 | $(filter %.a, $+) \ | 136 | $(filter %.a, $+) \ |
137 | -lgcc $(CODECLDFLAGS) | 137 | -lgcc $(CODECLDFLAGS) |
138 | ifdef SIMVER | 138 | ifdef APP_TYPE |
139 | $(SILENT)cp $(CODECDIR)/$*.elf $@ | 139 | $(SILENT)cp $(CODECDIR)/$*.elf $@ |
140 | else | 140 | else |
141 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ | 141 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ |