diff options
| author | Andres Freund <andres@anarazel.de> | 2022-09-24 12:04:56 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-09-24 12:04:56 -0700 |
| commit | eef63941c127bcfbc278445b85cf3d9dd9e323b0 (patch) | |
| tree | 2892a393f473bead740a980b2a7e6b256fd14b22 | |
| parent | a075c616d22921fd90eafa852f140df9cd832209 (diff) | |
| download | postgresql-eef63941c127bcfbc278445b85cf3d9dd9e323b0.tar.gz postgresql-eef63941c127bcfbc278445b85cf3d9dd9e323b0.zip | |
De-special-case pgevent's rc file handling
There's really no need to build win32ver.rc as part of building
pgmsgevent.rc. This will make it sligthly easier to add rc file generation to
the meson build.
| -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'); |