Commit4f5f485

committed

Avoid using dllwrap to build pgevent in Mingw builds.

If this works, we can get rid of configure's support for locating dllwrap... but let's see what the buildfarm says, first.Hiroshi Inoue

1 parent52acfd2 commit4f5f485Copy full SHA for 4f5f485

File tree

+13

-17

lines changed

+13

-17

lines changed

Lines changed: 8 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,30 +17,21 @@ include $(top_builddir)/src/Makefile.global`
`17`	`17`	`ifeq ($(PORTNAME), win32)`
`18`	`18`
`19`	`19`	`OBJS=pgevent.o pgmsgevent.o`
`20`		`-NAME=pgevent.dll`
	`20`	`+NAME=pgevent`
`21`	`21`
`22`		`-all:$(NAME)`
	`22`	`+SHLIB_LINK =`
	`23`	`+SHLIB_EXPORTS = exports.txt`
	`24`	`+`
	`25`	`+all: all-lib`
`23`	`26`
`24`	`27`	`install: all install-lib`
`25`	`28`
`26`		`-pgevent.dll: pgevent.def$(OBJS)`
`27`		`-$(DLLWRAP) --def$< -o$(NAME)$(OBJS)`
	`29`	`+include$(top_srcdir)/src/Makefile.shlib`
`28`	`30`
`29`	`31`	`pgmsgevent.o: pgmsgevent.rc win32ver.rc`
`30`	`32`	`$(WINDRES)$< -o$@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.`
`31`	`33`
`32`		`-all-lib:$(NAME)`
`33`		`-`
`34`		`-install-lib:$(NAME)`
`35`		`-$(INSTALL_STLIB)$<'$(DESTDIR)$(libdir)/$<'`
`36`		`-`
`37`		`-uninstall-lib:`
`38`		`-rm -f'$(DESTDIR)$(libdir)/$(NAME)'`
`39`		`-`
`40`		`-cleandistclean:`
`41`		`-rm -f$(OBJS)$(NAME) win32ver.rc`
`42`		`-`
`43`		`-clean-lib:`
`44`		`-rm -f$(NAME)`
	`34`	`+cleandistclean: clean-lib`
	`35`	`+rm -f$(OBJS) win32ver.rc`
`45`	`36`
`46`	`37`	`endif`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+; dlltool --output-def pgevent.def pgevent.o pgmsgevent.o`
	`2`	`+EXPORTS`
	`3`	`+DllUnregisterServer@0 ;`
	`4`	`+DllRegisterServer@0 ;`
	`5`	`+DllInstall ;`

Comments

(0)