Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit eef6394

Browse files
committed
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.
1 parent a075c61 commit eef6394

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/bin/pgevent/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ ifeq ($(PORTNAME), win32)
1717

1818
OBJS = \
1919
pgevent.o \
20-
pgmsgevent.o
20+
pgmsgevent.o \
21+
$(WIN32RES)
2122
NAME=pgevent
2223

2324
SHLIB_LINK =
@@ -29,7 +30,7 @@ install: all install-lib
2930

3031
include $(top_srcdir)/src/Makefile.shlib
3132

32-
pgmsgevent.o: pgmsgevent.rc win32ver.rc
33+
pgmsgevent.o: pgmsgevent.rc
3334
$(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.
3435

3536
clean distclean: clean-lib

src/bin/pgevent/pgmsgevent.rc

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
LANGUAGE 0x9,0x1
22
1 11 MSG00001.bin
3-
4-
#include "win32ver.rc"

src/tools/msvc/Mkvcbuild.pm

-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ sub mkvcbuild
425425
$pgevent->AddFiles('src/bin/pgevent', 'pgevent.c', 'pgmsgevent.rc');
426426
$pgevent->AddResourceFile('src/bin/pgevent', 'Eventlog message formatter',
427427
'win32');
428-
$pgevent->RemoveFile('src/bin/pgevent/win32ver.rc');
429428
$pgevent->UseDef('src/bin/pgevent/pgevent.def');
430429
$pgevent->DisableLinkerWarnings('4104');
431430

0 commit comments

Comments
 (0)