diff options
| author | davygrvy <davygrvy> | 2004-01-13 02:01:39 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2004-01-13 02:01:39 (GMT) |
| commit | 0e8d429d76ce7be9a8bf9f7351c002cd4c31314b (patch) | |
| tree | c768098950270689b01851184681d62cfa742b00 /win/rc | |
| parent | a70f322b94fb45e096f11ac6ded83285f7981d6a (diff) | |
| download | tk-0e8d429d76ce7be9a8bf9f7351c002cd4c31314b.zip tk-0e8d429d76ce7be9a8bf9f7351c002cd4c31314b.tar.gz tk-0e8d429d76ce7be9a8bf9f7351c002cd4c31314b.tar.bz2 | |
* win/rc/tk.rc:
* win/rc/tk_base.rc:
* win/rc/wish.rc:
* win/makefile.vc: Refreshed how the resource files are built.
Should be a bit easier for people linking with a static Tk library.
Diffstat (limited to 'win/rc')
| -rw-r--r-- | win/rc/tk.rc | 8 | ||||
| -rw-r--r-- | win/rc/tk_base.rc | 4 | ||||
| -rw-r--r-- | win/rc/wish.rc | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/win/rc/tk.rc b/win/rc/tk.rc index ff234be..c0cbfe0 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,4 +1,4 @@ -// RCS: @(#) $Id: tk.rc,v 1.9 2002/06/18 00:34:45 davygrvy Exp $ +// RCS: @(#) $Id: tk.rc,v 1.10 2004/01/13 02:01:55 davygrvy Exp $ // // Version Resource Script // @@ -9,13 +9,13 @@ // // build-up the name suffix that defines the type of build this is. // -#ifdef TCL_THREADS +#if TCL_THREADS #define SUFFIX_THREADS "t" #else #define SUFFIX_THREADS "" #endif -#ifdef DEBUG +#if DEBUG #define SUFFIX_DEBUG "d" #else #define SUFFIX_DEBUG "" @@ -42,7 +42,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tk DLL\0" - VALUE "OriginalFilename", "tk" STRINGIFY(JOIN(TK_MAJOR_VERSION,TK_MINOR_VERSION)) SUFFIX ".dll\0" + VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".dll\0" VALUE "CompanyName", "ActiveState Corporation\0" VALUE "FileVersion", TK_PATCH_LEVEL VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0" diff --git a/win/rc/tk_base.rc b/win/rc/tk_base.rc index 7a8a2eb..fa7dc9a 100644 --- a/win/rc/tk_base.rc +++ b/win/rc/tk_base.rc @@ -1,8 +1,10 @@ -// RCS: @(#) $Id: tk_base.rc,v 1.2 2000/10/31 01:28:27 davidg Exp $ +// RCS: @(#) $Id: tk_base.rc,v 1.3 2004/01/13 02:01:55 davygrvy Exp $ // // Base resources needed by Tk whether it's a DLL or a static library. // +#include <windows.h> + // // Tk Icon // diff --git a/win/rc/wish.rc b/win/rc/wish.rc index 4a1eb99..a4d45a0 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -1,4 +1,4 @@ -// RCS: @(#) $Id: wish.rc,v 1.8 2002/06/18 00:34:45 davygrvy Exp $ +// RCS: @(#) $Id: wish.rc,v 1.9 2004/01/13 02:01:55 davygrvy Exp $ // // Version Resource Script // @@ -9,19 +9,19 @@ // // build-up the name suffix that defines the type of build this is. // -#ifdef TCL_THREADS +#if TCL_THREADS #define SUFFIX_THREADS "t" #else #define SUFFIX_THREADS "" #endif -#ifdef STATIC_BUILD +#if STATIC_BUILD #define SUFFIX_STATIC "s" #else #define SUFFIX_STATIC "" #endif -#ifdef DEBUG +#if DEBUG #define SUFFIX_DEBUG "d" #else #define SUFFIX_DEBUG "" @@ -48,7 +48,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Wish Application\0" - VALUE "OriginalFilename", "wish" STRINGIFY(JOIN(TK_MAJOR_VERSION,TK_MINOR_VERSION)) SUFFIX ".exe\0" + VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" VALUE "CompanyName", "ActiveState Corporation\0" VALUE "FileVersion", TK_PATCH_LEVEL VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0" @@ -71,7 +71,7 @@ END app ICON DISCARDABLE "wish.ico" -#ifdef STATIC_BUILD +#if STATIC_BUILD #include "tk_base.rc" #endif |