Unified build system to use SOURCES for sim builds too, a single Makefile-look

made by configure and various related adjustments. This has not yet been tested
on cygwin.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6001 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 1 deletions

diff --git a/firmware/Makefile b/firmware/Makefile
index 966d9e048d..618a7703ac 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -11,7 +11,7 @@ INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers
 
 CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
 
-SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
+SRC := $(shell cat SOURCES | gcc -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - )
 SOURCES = $(SRC)
 OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o
 OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
@@ -29,6 +29,7 @@ $(TOOLSDIR)/convbdf:
 $(OUTPUT): $(OBJS) $(DEPFILE)
         @echo "AR $@"
         @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1
+        @$(RANLIB) $@
 
 include $(TOOLSDIR)/make.inc