diff options
author | Dave Chapman <dave@dchapman.com> | 2011-02-27 11:37:39 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2011-02-27 11:37:39 +0000 |
commit | 376c9f3ad0c257ee97d7eba03962f232e85b36a7 (patch) | |
tree | 3323dfd60b82814af115b4c436ea8680ca9da978 /tools/root.make | |
parent | 9501986047056c9f6ca954817ae597e302028f2e (diff) | |
download | rockbox-376c9f3ad0c257ee97d7eba03962f232e85b36a7.tar.gz rockbox-376c9f3ad0c257ee97d7eba03962f232e85b36a7.zip |
FS#11966 - use separate modelnames and config files for RaaA. This adds an APPLICATION define that can be used in Makefiles, and target-name defines (-DSDLAPP, -DANDROID, -DNOKIAN8XX and -DNOKIAN900) for use elsewhere. LCD size is now hard-coded for the Nokia builds in their config files. A new --app parameter is passed to buildzip.pl to explicitly state that this is an application build - it was previously derived from the model name.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29418 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/root.make b/tools/root.make index 0640ba5656..85a996fc62 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -251,10 +251,10 @@ tags: | |||
251 | $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) | 251 | $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) |
252 | 252 | ||
253 | fontzip: | 253 | fontzip: |
254 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) | 254 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) |
255 | 255 | ||
256 | zip: | 256 | zip: |
257 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 257 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
258 | 258 | ||
259 | mapzip: | 259 | mapzip: |
260 | $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip | 260 | $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip |
@@ -263,14 +263,14 @@ elfzip: | |||
263 | $(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip | 263 | $(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip |
264 | 264 | ||
265 | fullzip: | 265 | fullzip: |
266 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) | 266 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) |
267 | 267 | ||
268 | 7zip: | 268 | 7zip: |
269 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 269 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
270 | 270 | ||
271 | tar: | 271 | tar: |
272 | $(SILENT)rm -f rockbox.tar | 272 | $(SILENT)rm -f rockbox.tar |
273 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 273 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
274 | 274 | ||
275 | bzip2: tar | 275 | bzip2: tar |
276 | $(SILENT)bzip2 -f9 rockbox.tar | 276 | $(SILENT)bzip2 -f9 rockbox.tar |
@@ -305,15 +305,15 @@ bininstall: $(BUILDDIR)/$(BINARY) | |||
305 | 305 | ||
306 | install: | 306 | install: |
307 | @echo "Installing your build in your '$(RBPREFIX)' dir" | 307 | @echo "Installing your build in your '$(RBPREFIX)' dir" |
308 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) | 308 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) |
309 | 309 | ||
310 | fullinstall: | 310 | fullinstall: |
311 | @echo "Installing a full setup in your '$(RBPREFIX)' dir" | 311 | @echo "Installing a full setup in your '$(RBPREFIX)' dir" |
312 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) | 312 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) |
313 | 313 | ||
314 | symlinkinstall: | 314 | symlinkinstall: |
315 | @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" | 315 | @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" |
316 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l | 316 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l |
317 | endif | 317 | endif |
318 | 318 | ||
319 | help: | 319 | help: |