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
This commit is contained in:
Hardeep Sidhu 2003-07-09 06:31:55 +00:00
parent 078cc4a7cc
commit 8ba4044431

View file

@ -67,14 +67,15 @@ DEFINES += -DWIN32
CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin
APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mno-cygwin APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mno-cygwin
DLLFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin \ DLLTOOLFLAGS = --export-all
--def plugin.def DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/")
ifeq ($(UNAME),CYGWIN) ifeq ($(UNAME),CYGWIN)
CC = gcc CC = gcc
WINDRES = windres WINDRES = windres
DLL = dllwrap DLLTOOL = dlltool
DLLWRAP = dllwrap
DEFINES += -DNOCYGWIN DEFINES += -DNOCYGWIN
CFLAGS += -mno-cygwin CFLAGS += -mno-cygwin
LDFLAGS += -mno-cygwin LDFLAGS += -mno-cygwin
@ -82,7 +83,8 @@ ifeq ($(UNAME),CYGWIN)
else else
CC = i386-mingw32msvc-gcc CC = i386-mingw32msvc-gcc
WINDRES = i386-mingw32msvc-windres WINDRES = i386-mingw32msvc-windres
DLL = i386-mingw32msvc-dllwrap DLLTOOL = i386-mingw32msvc-dlltool
DLLWRAP = i386-mingw32msvc-dllwrap
CFLAGS += -mwindows CFLAGS += -mwindows
LDFLAGS += -mwindows LDFLAGS += -mwindows
APPCFLAGS += -mwindows APPCFLAGS += -mwindows
@ -128,7 +130,8 @@ $(OBJDIR)/uisw32-res.o: uisw32.rc
clean: clean:
$(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/uisw32-res.o \ $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/uisw32-res.o \
$(OBJDIR)/lang.[cho] $(OBJDIR)/build.lang $(OBJDIR)/*.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) $(RM) -r $(DEPS)
distclean: clean distclean: clean
@ -295,10 +298,11 @@ $(OBJDIR)/%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/%.po : $(PLUGINDIR)/%.c $(OBJDIR)/%.po : $(PLUGINDIR)/%.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(APPCFLAGS) -c $< -o $@
$(OBJDIR)/%.rock : $(OBJDIR)/%.po $(OBJDIR)/%.rock : $(OBJDIR)/%.po
-$(DLL) $(DLLFLAGS) $< -o $@ $(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< -o $@
DEPS:=$(OBJDIR)/.deps DEPS:=$(OBJDIR)/.deps