NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commiteef6394

committed

De-special-case pgevent's rc file handling

There's really no need to build win32ver.rc as part of buildingpgmsgevent.rc. This will make it sligthly easier to add rc file generation tothe meson build.

1 parenta075c61 commiteef6394Copy full SHA for eef6394

File tree

3 files changed

-5

lines changed

src
- bin/pgevent
  - Makefile
  - pgmsgevent.rc
- tools/msvc
  - Mkvcbuild.pm

3 files changed

-5

lines changed

`‎src/bin/pgevent/Makefile`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ ifeq ($(PORTNAME), win32)`
`17`	`17`
`18`	`18`	`OBJS =\`
`19`	`19`	`pgevent.o\`
`20`		`-pgmsgevent.o`
	`20`	`+pgmsgevent.o\`
	`21`	`+$(WIN32RES)`
`21`	`22`	`NAME=pgevent`
`22`	`23`
`23`	`24`	`SHLIB_LINK =`
`@@ -29,7 +30,7 @@ install: all install-lib`
`29`	`30`
`30`	`31`	`include$(top_srcdir)/src/Makefile.shlib`
`31`	`32`
`32`		`-pgmsgevent.o: pgmsgevent.rc win32ver.rc`
	`33`	`+pgmsgevent.o: pgmsgevent.rc`
`33`	`34`	`$(WINDRES)$< -o$@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.`
`34`	`35`
`35`	`36`	`cleandistclean: clean-lib`

`‎src/bin/pgevent/pgmsgevent.rc`

Lines changed: 0 additions & 2 deletions

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

`‎src/tools/msvc/Mkvcbuild.pm`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,6 @@ sub mkvcbuild`
`425`	`425`	`$pgevent->AddFiles('src/bin/pgevent','pgevent.c','pgmsgevent.rc');`
`426`	`426`	`$pgevent->AddResourceFile('src/bin/pgevent','Eventlog message formatter',`
`427`	`427`	`'win32');`
`428`		`-$pgevent->RemoveFile('src/bin/pgevent/win32ver.rc');`
`429`	`428`	`$pgevent->UseDef('src/bin/pgevent/pgevent.def');`
`430`	`429`	`$pgevent->DisableLinkerWarnings('4104');`
`431`	`430`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commiteef6394

File tree

3 files changed

3 files changed

`‎src/bin/pgevent/Makefile`

`‎src/bin/pgevent/pgmsgevent.rc`

`‎src/tools/msvc/Mkvcbuild.pm`

0 commit comments