diff options
| -rw-r--r-- | src/bin/pgevent/Makefile | 5 | ||||
| -rw-r--r-- | src/bin/pgevent/pgmsgevent.rc | 2 | ||||
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile index dea79d3f137..04d49711d8d 100644 --- a/src/bin/pgevent/Makefile +++ b/src/bin/pgevent/Makefile @@ -17,7 +17,8 @@ ifeq ($(PORTNAME), win32) OBJS = \ pgevent.o \ - pgmsgevent.o + pgmsgevent.o \ + $(WIN32RES) NAME=pgevent SHLIB_LINK = @@ -29,7 +30,7 @@ install: all install-lib include $(top_srcdir)/src/Makefile.shlib -pgmsgevent.o: pgmsgevent.rc win32ver.rc +pgmsgevent.o: pgmsgevent.rc $(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=. clean distclean: clean-lib diff --git a/src/bin/pgevent/pgmsgevent.rc b/src/bin/pgevent/pgmsgevent.rc index e69862e882c..0885a897e6f 100644 --- a/src/bin/pgevent/pgmsgevent.rc +++ b/src/bin/pgevent/pgmsgevent.rc @@ -1,4 +1,2 @@ LANGUAGE 0x9,0x1 1 11 MSG00001.bin - -#include "win32ver.rc" diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 098bc3f1b09..ddb4f25eb12 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -425,7 +425,6 @@ sub mkvcbuild $pgevent->AddFiles('src/bin/pgevent', 'pgevent.c', 'pgmsgevent.rc'); $pgevent->AddResourceFile('src/bin/pgevent', 'Eventlog message formatter', 'win32'); - $pgevent->RemoveFile('src/bin/pgevent/win32ver.rc'); $pgevent->UseDef('src/bin/pgevent/pgevent.def'); $pgevent->DisableLinkerWarnings('4104'); |