summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorHardeep Sidhu <dyp@pobox.com>2003-07-09 06:31:55 +0000
committerHardeep Sidhu <dyp@pobox.com>2003-07-09 06:31:55 +0000
commit8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0 (patch)
treebc457ffef871c30fce295976d5740ee807c954dc /uisimulator
parent078cc4a7ccd2fad8202d4fa4650faa326bda1dac (diff)
downloadrockbox-8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0.tar.gz
rockbox-8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0.tar.bz2
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')
-rw-r--r--uisimulator/win32/Makefile18
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
CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin
APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mno-cygwin
-DLLFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin \
- --def plugin.def
+DLLTOOLFLAGS = --export-all
+DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/")
ifeq ($(UNAME),CYGWIN)
CC = gcc
WINDRES = windres
- DLL = dllwrap
+ DLLTOOL = dlltool
+ DLLWRAP = dllwrap
DEFINES += -DNOCYGWIN
CFLAGS += -mno-cygwin
LDFLAGS += -mno-cygwin
@@ -82,7 +83,8 @@ ifeq ($(UNAME),CYGWIN)
else
CC = i386-mingw32msvc-gcc
WINDRES = i386-mingw32msvc-windres
- DLL = i386-mingw32msvc-dllwrap
+ DLLTOOL = i386-mingw32msvc-dlltool
+ DLLWRAP = i386-mingw32msvc-dllwrap
CFLAGS += -mwindows
LDFLAGS += -mwindows
APPCFLAGS += -mwindows
@@ -128,7 +130,8 @@ $(OBJDIR)/uisw32-res.o: uisw32.rc
clean:
$(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/uisw32-res.o \
$(OBJDIR)/lang.[cho] $(OBJDIR)/build.lang $(OBJDIR)/*.o \
- $(OBJDIR)/*.rock $(OBJDIR)/sysfont.c $(OBJDIR)/credits.raw
+ $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \
+ $(OBJDIR)/credits.raw
$(RM) -r $(DEPS)
distclean: clean
@@ -295,10 +298,11 @@ $(OBJDIR)/%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/%.po : $(PLUGINDIR)/%.c
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(APPCFLAGS) -c $< -o $@
$(OBJDIR)/%.rock : $(OBJDIR)/%.po
- -$(DLL) $(DLLFLAGS) $< -o $@
+ $(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
+ $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< -o $@
DEPS:=$(OBJDIR)/.deps