From b3f2c531557d9f6d338a0426b94fcdafd9aad0e8 Mon Sep 17 00:00:00 2001 From: Ge van Geldorp Date: Wed, 27 Oct 2004 00:47:53 +0000 Subject: [PATCH] Use only one .res file. --- dlls/mpr/Makefile.in | 5 +---- dlls/mpr/mpr.rc | 2 ++ dlls/ole32/Makefile.in | 2 +- dlls/ole32/ole32res.rc | 2 ++ dlls/oleaut32/Makefile.in | 4 +--- dlls/oleaut32/oleaut32.rc | 2 ++ dlls/shell32/Makefile.in | 2 +- dlls/shell32/shres.rc | 2 ++ 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 96ab0eb6c6..2f8fedca56 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -14,10 +14,7 @@ C_SRCS = \ pwcache.c \ wnet.c -RC_SRCS = \ - mpr.rc \ - version.rc - +RC_SRCS = mpr.rc @MAKE_DLL_RULES@ diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index efaf3ae81e..10bae36403 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -21,6 +21,8 @@ #include "winbase.h" #include "mprres.h" +#include "version.rc" + #include "mpr_Cs.rc" #include "mpr_De.rc" #include "mpr_En.rc" diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 533f8ab4b3..9e1170351d 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -53,7 +53,7 @@ SPEC_SRCS16 = \ ole2thk.spec \ storage.spec -RC_SRCS = ole32res.rc version.rc +RC_SRCS = ole32res.rc RC_BINSRC = ole32res.rc RC_BINARIES = \ drag_copy.cur \ diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc index 6546fc2a7b..cc4c0b2525 100644 --- a/dlls/ole32/ole32res.rc +++ b/dlls/ole32/ole32res.rc @@ -23,6 +23,8 @@ #include "winuser.h" #include "winnls.h" +#include "version.rc" + /* * Everything that does not depend on language, * like textless bitmaps etc, go into the diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 14e272dda5..428c9e8535 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -35,9 +35,7 @@ SPEC_SRCS16 = \ ole2disp.spec \ typelib.spec -RC_SRCS = \ - oleaut32.rc \ - version.rc +RC_SRCS = oleaut32.rc SUBDIRS = tests diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 641f3924d9..fcff4f6e54 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -22,6 +22,8 @@ #include "winbase.h" #include "resource.h" +#include "version.rc" + #include "oleaut32_De.rc" #include "oleaut32_Dk.rc" #include "oleaut32_En.rc" diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e9d2c944d4..50291512f4 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -48,7 +48,7 @@ C_SRCS = \ shv_item_cmenu.c \ systray.c -RC_SRCS = shres.rc version.rc +RC_SRCS = shres.rc RC_BINSRC = shres.rc RC_BINARIES = \ cdrom.ico \ diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index c9f7026f4a..ddc12417d9 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -26,6 +26,8 @@ #include "shlobj.h" #include "shresdef.h" +#include "version.rc" + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL shv_accel ACCELERATORS -- 2.33.8