diff options
author | Hardeep Sidhu <dyp@pobox.com> | 2003-07-09 06:31:55 +0000 |
---|---|---|
committer | Hardeep Sidhu <dyp@pobox.com> | 2003-07-09 06:31:55 +0000 |
commit | 8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0 (patch) | |
tree | bc457ffef871c30fce295976d5740ee807c954dc /uisimulator/win32 | |
parent | 078cc4a7ccd2fad8202d4fa4650faa326bda1dac (diff) | |
download | rockbox-8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0.tar.gz rockbox-8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0.zip |
Extract exports from obj file. Don't ignore dllwrap errors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3819 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 8270ceed4d..aa72171bdb 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -67,14 +67,15 @@ DEFINES += -DWIN32 | |||
67 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin | 67 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin |
68 | 68 | ||
69 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mno-cygwin | 69 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mno-cygwin |
70 | DLLFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin \ | 70 | DLLTOOLFLAGS = --export-all |
71 | --def plugin.def | 71 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
72 | 72 | ||
73 | UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") | 73 | UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") |
74 | ifeq ($(UNAME),CYGWIN) | 74 | ifeq ($(UNAME),CYGWIN) |
75 | CC = gcc | 75 | CC = gcc |
76 | WINDRES = windres | 76 | WINDRES = windres |
77 | DLL = dllwrap | 77 | DLLTOOL = dlltool |
78 | DLLWRAP = dllwrap | ||
78 | DEFINES += -DNOCYGWIN | 79 | DEFINES += -DNOCYGWIN |
79 | CFLAGS += -mno-cygwin | 80 | CFLAGS += -mno-cygwin |
80 | LDFLAGS += -mno-cygwin | 81 | LDFLAGS += -mno-cygwin |
@@ -82,7 +83,8 @@ ifeq ($(UNAME),CYGWIN) | |||
82 | else | 83 | else |
83 | CC = i386-mingw32msvc-gcc | 84 | CC = i386-mingw32msvc-gcc |
84 | WINDRES = i386-mingw32msvc-windres | 85 | WINDRES = i386-mingw32msvc-windres |
85 | DLL = i386-mingw32msvc-dllwrap | 86 | DLLTOOL = i386-mingw32msvc-dlltool |
87 | DLLWRAP = i386-mingw32msvc-dllwrap | ||
86 | CFLAGS += -mwindows | 88 | CFLAGS += -mwindows |
87 | LDFLAGS += -mwindows | 89 | LDFLAGS += -mwindows |
88 | APPCFLAGS += -mwindows | 90 | APPCFLAGS += -mwindows |
@@ -128,7 +130,8 @@ $(OBJDIR)/uisw32-res.o: uisw32.rc | |||
128 | clean: | 130 | clean: |
129 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/uisw32-res.o \ | 131 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/uisw32-res.o \ |
130 | $(OBJDIR)/lang.[cho] $(OBJDIR)/build.lang $(OBJDIR)/*.o \ | 132 | $(OBJDIR)/lang.[cho] $(OBJDIR)/build.lang $(OBJDIR)/*.o \ |
131 | $(OBJDIR)/*.rock $(OBJDIR)/sysfont.c $(OBJDIR)/credits.raw | 133 | $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \ |
134 | $(OBJDIR)/credits.raw | ||
132 | $(RM) -r $(DEPS) | 135 | $(RM) -r $(DEPS) |
133 | 136 | ||
134 | distclean: clean | 137 | distclean: clean |
@@ -295,10 +298,11 @@ $(OBJDIR)/%.o: %.c | |||
295 | $(CC) $(CFLAGS) -c $< -o $@ | 298 | $(CC) $(CFLAGS) -c $< -o $@ |
296 | 299 | ||
297 | $(OBJDIR)/%.po : $(PLUGINDIR)/%.c | 300 | $(OBJDIR)/%.po : $(PLUGINDIR)/%.c |
298 | $(CC) $(CFLAGS) -c $< -o $@ | 301 | $(CC) $(APPCFLAGS) -c $< -o $@ |
299 | 302 | ||
300 | $(OBJDIR)/%.rock : $(OBJDIR)/%.po | 303 | $(OBJDIR)/%.rock : $(OBJDIR)/%.po |
301 | -$(DLL) $(DLLFLAGS) $< -o $@ | 304 | $(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
305 | $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< -o $@ | ||
302 | 306 | ||
303 | DEPS:=$(OBJDIR)/.deps | 307 | DEPS:=$(OBJDIR)/.deps |
304 | 308 | ||