From e2375ad75b0b05de02279947cb17251b3f7961e5 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Tue, 19 Apr 2011 05:33:59 -0700 Subject: [PATCH] More resource fixes to compiling on VS 2008 Express Edition. --- .../plPlasmaInstaller/plPlasmaInstaller.rc | 13 +++---------- .../Apps/plPlasmaUpdate/plPlasmaUpdate.rc | 13 +++---------- .../FeatureLib/pfLoginDialog/pfLoginDialog.rc | 13 +++---------- .../PubUtilLib/plSDLBrowser/plSDLBrowser.rc | 13 +++---------- Sources/Tools/MaxComponent/plComponent.rc | 13 +++---------- Sources/Tools/MaxMain/SimpleExport.rc | 13 +++---------- .../Tools/MaxMtlUpdate/plMaterialUpdate.rc | 13 +++---------- Sources/Tools/MaxPlasmaLights/plRTLights.rc | 17 +++-------------- Sources/Tools/MaxPlasmaMtls/MaxPlasmaMtls.rc | 13 +++---------- Sources/Tools/Migration/Migration.rc | 19 +++---------------- .../plFontConverter/res/plFontConverter.rc | 13 +++---------- .../Tools/plResBrowser/res/plResBrowser.rc | 13 +++---------- 12 files changed, 36 insertions(+), 130 deletions(-) diff --git a/Sources/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.rc b/Sources/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.rc index da984e23..9c9bca40 100644 --- a/Sources/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.rc +++ b/Sources/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -91,7 +85,6 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.rc b/Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.rc index 01a1f351..5d5463be 100644 --- a/Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.rc +++ b/Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -100,7 +94,6 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/pfLoginDialog.rc b/Sources/Plasma/FeatureLib/pfLoginDialog/pfLoginDialog.rc index 066e4c09..f4e94f94 100644 --- a/Sources/Plasma/FeatureLib/pfLoginDialog/pfLoginDialog.rc +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/pfLoginDialog.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -34,7 +28,6 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Plasma/PubUtilLib/plSDLBrowser/plSDLBrowser.rc b/Sources/Plasma/PubUtilLib/plSDLBrowser/plSDLBrowser.rc index 0f3b49bb..6886a2cd 100644 --- a/Sources/Plasma/PubUtilLib/plSDLBrowser/plSDLBrowser.rc +++ b/Sources/Plasma/PubUtilLib/plSDLBrowser/plSDLBrowser.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -77,7 +71,6 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Tools/MaxComponent/plComponent.rc b/Sources/Tools/MaxComponent/plComponent.rc index 5ecbc99c..6c8baf69 100644 --- a/Sources/Tools/MaxComponent/plComponent.rc +++ b/Sources/Tools/MaxComponent/plComponent.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -6057,7 +6051,6 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Tools/MaxMain/SimpleExport.rc b/Sources/Tools/MaxMain/SimpleExport.rc index e335a965..cb57200e 100644 --- a/Sources/Tools/MaxMain/SimpleExport.rc +++ b/Sources/Tools/MaxMain/SimpleExport.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -34,7 +28,6 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Tools/MaxMtlUpdate/plMaterialUpdate.rc b/Sources/Tools/MaxMtlUpdate/plMaterialUpdate.rc index b22f4c5a..d3738171 100644 --- a/Sources/Tools/MaxMtlUpdate/plMaterialUpdate.rc +++ b/Sources/Tools/MaxMtlUpdate/plMaterialUpdate.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -68,7 +62,6 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Tools/MaxPlasmaLights/plRTLights.rc b/Sources/Tools/MaxPlasmaLights/plRTLights.rc index bdafa31e..15648f69 100644 --- a/Sources/Tools/MaxPlasmaLights/plRTLights.rc +++ b/Sources/Tools/MaxPlasmaLights/plRTLights.rc @@ -2,17 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -388,9 +380,6 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/Sources/Tools/MaxPlasmaMtls/MaxPlasmaMtls.rc b/Sources/Tools/MaxPlasmaMtls/MaxPlasmaMtls.rc index 5f520a97..e5fe2837 100644 --- a/Sources/Tools/MaxPlasmaMtls/MaxPlasmaMtls.rc +++ b/Sources/Tools/MaxPlasmaMtls/MaxPlasmaMtls.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -1051,7 +1045,6 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Tools/Migration/Migration.rc b/Sources/Tools/Migration/Migration.rc index 297a9b0b..1c630d3b 100644 --- a/Sources/Tools/Migration/Migration.rc +++ b/Sources/Tools/Migration/Migration.rc @@ -2,18 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -42,10 +33,6 @@ IDI_SMALL ICON DISCARDABLE "SMALL.ICO" 2 TEXTINCLUDE DISCARDABLE BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" "\0" END diff --git a/Sources/Tools/plFontConverter/res/plFontConverter.rc b/Sources/Tools/plFontConverter/res/plFontConverter.rc index 7c9b8b6b..a47b2de3 100644 --- a/Sources/Tools/plFontConverter/res/plFontConverter.rc +++ b/Sources/Tools/plFontConverter/res/plFontConverter.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -43,7 +37,6 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" "\0" END diff --git a/Sources/Tools/plResBrowser/res/plResBrowser.rc b/Sources/Tools/plResBrowser/res/plResBrowser.rc index 055b9063..f63d2146 100644 --- a/Sources/Tools/plResBrowser/res/plResBrowser.rc +++ b/Sources/Tools/plResBrowser/res/plResBrowser.rc @@ -2,15 +2,9 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define WIN32_LEAN_AND_MEAN +#include +#define IDC_STATIC (-1) // all static controls ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -48,7 +42,6 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" "\0" END