From 681d9e61cb5b5535ac6347ff39790b10fa92f947 Mon Sep 17 00:00:00 2001 From: jacob Date: Sat, 26 Feb 2005 17:43:47 +0000 Subject: [PATCH] Pull out the common compiler-specific workarounds and so on from individual resource files into windows/rcstuff.h. git-svn-id: svn://svn.tartarus.org/sgt/putty@5405 cda61777-01e9-0310-a592-d414129be87e --- windows/pageant.rc | 22 ++++------------------ windows/puttygen.rc | 22 ++++------------------ windows/rcstuff.h | 37 +++++++++++++++++++++++++++++++++++++ windows/win_res.rc | 32 ++++---------------------------- 4 files changed, 49 insertions(+), 64 deletions(-) create mode 100644 windows/rcstuff.h diff --git a/windows/pageant.rc b/windows/pageant.rc index 336271eb..3967ee5d 100644 --- a/windows/pageant.rc +++ b/windows/pageant.rc @@ -1,22 +1,8 @@ -/* Some compilers, like Borland, don't have winresrc.h */ -#ifdef __LCC__ -#include -#else +/* + * Windows resources for Pageant. + */ -#ifndef NO_WINRESRC_H -#ifndef MSVC4 -#include -#else -#include -#endif -#endif - -#endif /* end #ifdef __LCC__ */ - -/* Some systems don't define this, so I do it myself if necessary */ -#ifndef RT_MANIFEST -#define RT_MANIFEST 24 -#endif +#include "rcstuff.h" 200 ICON "pageant.ico" 201 ICON "pageants.ico" diff --git a/windows/puttygen.rc b/windows/puttygen.rc index dec06921..417f83d0 100644 --- a/windows/puttygen.rc +++ b/windows/puttygen.rc @@ -1,22 +1,8 @@ -/* Some compilers, like Borland, don't have winresrc.h */ -#ifdef __LCC__ -#include -#else +/* + * Windows resources for PuTTYgen. + */ -#ifndef NO_WINRESRC_H -#ifndef MSVC4 -#include -#else -#include -#endif -#endif - -#endif /* end #ifdef __LCC__ */ - -/* Some systems don't define this, so I do it myself if necessary */ -#ifndef RT_MANIFEST -#define RT_MANIFEST 24 -#endif +#include "rcstuff.h" 200 ICON "puttygen.ico" diff --git a/windows/rcstuff.h b/windows/rcstuff.h new file mode 100644 index 00000000..5b2fc3b0 --- /dev/null +++ b/windows/rcstuff.h @@ -0,0 +1,37 @@ +/* + * Miscellaneous stuff to include in all .rc files. + */ + +#ifndef PUTTY_RCSTUFF_H +#define PUTTY_RCSTUFF_H + +#ifdef __LCC__ +#include +#else + +/* Some compilers, like Borland, don't have winresrc.h */ +#ifndef NO_WINRESRC_H +#ifndef MSVC4 +#include +#else +#include +#endif +#endif + +#endif /* end #ifdef __LCC__ */ + +/* Some systems don't define this, so I do it myself if necessary */ +#ifndef TCS_MULTILINE +#define TCS_MULTILINE 0x0200 +#endif + +/* Likewise */ +#ifndef RT_MANIFEST +#define RT_MANIFEST 24 +#endif + +#ifdef MINGW32_FIX +#define EDITTEXT EDITTEXT "", +#endif + +#endif /* PUTTY_RCSTUFF_H */ diff --git a/windows/win_res.rc b/windows/win_res.rc index 3a96cca7..d89868d6 100644 --- a/windows/win_res.rc +++ b/windows/win_res.rc @@ -1,32 +1,8 @@ -/* Some compilers, like Borland, don't have winresrc.h */ -#ifdef __LCC__ -#include -#else - -#ifndef NO_WINRESRC_H -#ifndef MSVC4 -#include -#else -#include -#endif -#endif - -#endif /* end #ifdef __LCC__ */ - -/* Some systems don't define this, so I do it myself if necessary */ -#ifndef TCS_MULTILINE -#define TCS_MULTILINE 0x0200 -#endif - -/* Likewise */ -#ifndef RT_MANIFEST -#define RT_MANIFEST 24 -#endif - -#ifdef MINGW32_FIX -#define EDITTEXT EDITTEXT "", -#endif +/* + * Windows resources for PuTTY and PuTTYtel. + */ +#include "rcstuff.h" #include "win_res.h" IDI_MAINICON ICON "putty.ico" -- 2.11.0