diff options
| author | davygrvy <davygrvy> | 2002-06-18 00:34:45 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2002-06-18 00:34:45 (GMT) |
| commit | 9244c6c5d0887b5f57641877727c0bb0400499fd (patch) | |
| tree | f67fee15d8fd4b2f06a42cfa952519ed699c451b /win | |
| parent | f661c8d8f05bc45cb77c196f3b89e5fc90d00500 (diff) | |
| download | tk-9244c6c5d0887b5f57641877727c0bb0400499fd.zip tk-9244c6c5d0887b5f57641877727c0bb0400499fd.tar.gz tk-9244c6c5d0887b5f57641877727c0bb0400499fd.tar.bz2 | |
Trims to support the removal of RESOURCE_INCLUDED from rc
scripts from Tcl's accepted FR #565088.
* generic/tk.h: Changed RESOURCE_INCLUDED to be RC_INVOKED
as the RC tool defines this already by default.
* win/rc/tk.rc:
* win/rc/wish.rc: removed the #define RESOURCE_INCLUDED lines.
Diffstat (limited to 'win')
| -rw-r--r-- | win/rc/tk.rc | 10 | ||||
| -rw-r--r-- | win/rc/wish.rc | 9 |
2 files changed, 4 insertions, 15 deletions
diff --git a/win/rc/tk.rc b/win/rc/tk.rc index bdca9cd..ff234be 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,17 +1,11 @@ -// RCS: @(#) $Id: tk.rc,v 1.8 2001/11/10 00:58:51 hobbs Exp $ +// RCS: @(#) $Id: tk.rc,v 1.9 2002/06/18 00:34:45 davygrvy Exp $ // // Version Resource Script // #include <windows.h> - -#define RESOURCE_INCLUDED #include <tk.h> -#define STRINGIFY1(x) #x -#define STRINGIFY(x) STRINGIFY1(x) - - // // build-up the name suffix that defines the type of build this is. // @@ -48,7 +42,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tk DLL\0" - VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".dll\0" + VALUE "OriginalFilename", "tk" STRINGIFY(JOIN(TK_MAJOR_VERSION,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/wish.rc b/win/rc/wish.rc index d10a200..4a1eb99 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -1,16 +1,11 @@ -// RCS: @(#) $Id: wish.rc,v 1.7 2001/11/10 00:58:51 hobbs Exp $ +// RCS: @(#) $Id: wish.rc,v 1.8 2002/06/18 00:34:45 davygrvy Exp $ // // Version Resource Script // #include <windows.h> - -#define RESOURCE_INCLUDED #include <tk.h> -#define STRINGIFY1(x) #x -#define STRINGIFY(x) STRINGIFY1(x) - // // build-up the name suffix that defines the type of build this is. // @@ -53,7 +48,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Wish Application\0" - VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "OriginalFilename", "wish" STRINGIFY(JOIN(TK_MAJOR_VERSION,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" |