database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

De-special-case pgevent's rc file handling

Browse Source 
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.
This commit is contained in:
Andres Freund
2022-09-24 12:04:56 -07:00
parent a075c616d2
commit eef63941c1
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/pgevent/Makefile
View File

@ -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

2
src/bin/pgevent/pgmsgevent.rc
View File

@ -1,4 +1,2 @@
LANGUAGE 0x9,0x1
1 11 MSG00001.bin
#include "win32ver.rc"

1
src/tools/msvc/Mkvcbuild.pm
View File

@ -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');