diff options
-rw-r--r-- | apps/codecs/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/chessbox/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/doom/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/pacbox/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/searchengine/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/sudoku/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/Makefile | 2 |
10 files changed, 12 insertions, 10 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 65c319bafe..f2cf707b0a 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile @@ -70,7 +70,8 @@ $(OBJDIR)/wav_enc.elf: $(OBJDIR)/wav_enc.o $(OBJDIR)/wavpack_enc.elf: $(OBJDIR)/wavpack_enc.o $(BUILDDIR)/libwavpack.a $(OBJDIR)/%.elf: $(OBJDIR)/codec_crt0.o - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc \ + -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map $(OBJDIR)/%.codec : $(OBJDIR)/%.elf $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 371a04ef4b..4f518a2c1c 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -89,7 +89,8 @@ $(BITMAPLIBS): $(BUILDDIR)/libplugin%.a: build-% ifndef SIMVER $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc \ + -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map $(OBJDIR)/%.rock : $(OBJDIR)/%.elf $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile index 5f1a855082..7d8653285e 100644 --- a/apps/plugins/chessbox/Makefile +++ b/apps/plugins/chessbox/Makefile @@ -40,7 +40,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/chessbox.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/chessbox.map $(OUTPUT): $(OBJDIR)/chessbox.elf diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index a90a864f36..46bd728ecb 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile @@ -101,7 +101,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/doom.elf: $(OBJS) $(LINKFILE) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) $(LDFLAGS) -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc\ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc\ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/doom.map $(OUTPUT): $(OBJDIR)/doom.elf diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile index f31f00f26c..7b52d2df5e 100644 --- a/apps/plugins/mpegplayer/Makefile +++ b/apps/plugins/mpegplayer/Makefile @@ -34,7 +34,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/mpegplayer.elf: $(OBJS) $(LINKFILE) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lmad -lgcc\ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lmad -lgcc\ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/mpegplayer.map $(OUTPUT): $(OBJDIR)/mpegplayer.elf diff --git a/apps/plugins/pacbox/Makefile b/apps/plugins/pacbox/Makefile index c88d8ae4ab..7a62d98462 100644 --- a/apps/plugins/pacbox/Makefile +++ b/apps/plugins/pacbox/Makefile @@ -34,7 +34,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/pacbox.elf: $(OBJS) $(LINKFILE) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/pacbox.map $(OUTPUT): $(OBJDIR)/pacbox.elf diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index 2859936d15..774be303fd 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile @@ -44,7 +44,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/rockboy.elf: $(OBJS) $(LINKFILE) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O2 -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -fast -lgcc \ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -fast -lgcc \ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockboy.map $(OUTPUT): $(OBJDIR)/rockboy.elf diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index 1c71c9b30d..b24c89a4db 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile @@ -31,7 +31,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/searchengine.elf: $(OBJS) $(LINKFILE) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map $(OUTPUT): $(OBJDIR)/searchengine.elf diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile index debd9fecc2..ce3c2027af 100644 --- a/apps/plugins/sudoku/Makefile +++ b/apps/plugins/sudoku/Makefile @@ -38,7 +38,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/sudoku.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/sudoku.map $(OUTPUT): $(OBJDIR)/sudoku.elf diff --git a/apps/plugins/zxbox/Makefile b/apps/plugins/zxbox/Makefile index 3ca5d300f1..49f16a0bd2 100644 --- a/apps/plugins/zxbox/Makefile +++ b/apps/plugins/zxbox/Makefile @@ -43,7 +43,7 @@ all: $(OUTPUT) ifndef SIMVER $(OBJDIR)/zxbox.elf: $(OBJS) $(LINKFILE) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/zxbox.map $(OUTPUT): $(OBJDIR)/zxbox.elf |