Pull out the common compiler-specific workarounds and so on from individual

resource files into windows/rcstuff.h.

[originally from svn r5405]

diff --git a/windows/pageant.rc b/windows/pageant.rc
index 336271ebbe55f4e02e9292460175ed9b04723ce4..3967ee5d1e16596d53a2f0ef6bfebdf54ca299cf 100644 (file)
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -1,22 +1,8 @@
-/* Some compilers, like Borland, don't have winresrc.h */
-#ifdef __LCC__ 
-#include <win.h>
-#else
+/*
+ * Windows resources for Pageant.
+ */
 
-#ifndef NO_WINRESRC_H
-#ifndef MSVC4
-#include <winresrc.h>
-#else
-#include <winres.h>
-#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 dec06921c07027aa4a3ab1c5694b445242a03a0d..417f83d078ed6753b080492396a3aab17f1c4f60 100644 (file)
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -1,22 +1,8 @@
-/* Some compilers, like Borland, don't have winresrc.h */
-#ifdef __LCC__ 
-#include <win.h>
-#else
+/*
+ * Windows resources for PuTTYgen.
+ */
 
-#ifndef NO_WINRESRC_H
-#ifndef MSVC4
-#include <winresrc.h>
-#else
-#include <winres.h>
-#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 (file)
index 0000000..5b2fc3b
--- /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 <win.h>
+#else
+
+/* Some compilers, like Borland, don't have winresrc.h */
+#ifndef NO_WINRESRC_H
+#ifndef MSVC4
+#include <winresrc.h>
+#else
+#include <winres.h>
+#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 3a96cca7276f6abb95474700ebd643b70ad4e4eb..d89868d642b9fa6377b530723b5566b9664e25d0 100644 (file)
--- 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 <win.h>
-#else
-
-#ifndef NO_WINRESRC_H
-#ifndef MSVC4
-#include <winresrc.h>
-#else
-#include <winres.h>
-#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"