diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-15 05:41:41 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-15 05:41:41 +0000 |
| commit | 5b9c4c12974adedbdf8cafd151716eb82d6f26be (patch) | |
| tree | e2ca62a89a59b9041f3e5822d54f83d82993f944 | |
| parent | 56e6335e8f95ec1ea043b94e72e3e5a0b5a07db9 (diff) | |
| download | rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.zip rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.tar.gz rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.tar.bz2 rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.tar.xz | |
The plugin lib now works in the win32 simulator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4747 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/lib/Makefile | 13 | ||||
| -rw-r--r-- | uisimulator/win32/Makefile | 8 |
2 files changed, 19 insertions, 2 deletions
diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index f4d3cff..818140f 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile @@ -7,11 +7,19 @@ # $Id$ # +ifdef SIMULATOR +CC = gcc +LD = ld +AR = ar +AS = as +OC = objcopy +else CC = sh-elf-gcc LD = sh-elf-ld AR = sh-elf-ar AS = sh-elf-as OC = sh-elf-objcopy +endif FIRMWARE = ../../../firmware @@ -21,8 +29,13 @@ FIRMWARE = ../../../firmware INCLUDES=-I../.. -I.. -I. -I$(FIRMWARE)/include -I$(FIRMWARE)/export \ -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers +ifdef SIMULATOR +CFLAGS = -W -Wall -O -nostdlib -ffreestanding -Wstrict-prototypes \ +$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) +else CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes \ $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEM} +endif ifndef MEM # if MEM is not set, assume 2MB diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 402b9ad..59949b9 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile @@ -128,7 +128,10 @@ all: $(TOOLSDIR)/convbdf $(TARGET) $(ROCKS) $(TOOLSDIR)/convbdf: $(MAKE) -C $(TOOLSDIR) -$(TARGET): $(OBJS) +$(OBJDIR)/libplugin.a: + $(MAKE) -C $(PLUGINDIR)/lib DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" SIMULATOR=1 + +$(TARGET): $(OBJS) $(OBJDIR)/libplugin.a $(CC) $(OBJS) -o $(TARGET) $(LDFLAGS) $(OBJDIR)/uisw32-res.o: uisw32.rc @@ -140,6 +143,7 @@ clean: $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \ $(OBJDIR)/credits.raw $(RM) -r $(DEPS) + $(MAKE) -C $(PLUGINDIR)/lib clean distclean: clean $(RM) config.cache @@ -324,7 +328,7 @@ $(OBJDIR)/%.po : $(PLUGINDIR)/%.c $(OBJDIR)/%.rock : $(OBJDIR)/%.po $(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< - $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< -o $@ + $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@ DEPS:=$(OBJDIR)/.deps |