summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2002-06-18 00:12:24 (GMT)
committerdavygrvy <davygrvy@pobox.com>2002-06-18 00:12:24 (GMT)
commit2a58823e756c00cf27d05db75d5b507b78787a9f (patch)
treea79e28d26611c7fd48e8b2d9c1e181f68684c545 /win
parent6bc33db4402cc162594aa68e4d6450291e48600a (diff)
downloadtcl-2a58823e756c00cf27d05db75d5b507b78787a9f.zip
tcl-2a58823e756c00cf27d05db75d5b507b78787a9f.tar.gz
tcl-2a58823e756c00cf27d05db75d5b507b78787a9f.tar.bz2
Trims to support the removal of RESOURCE_INCLUDED from rc
scripts from FR #565088. * generic/tcl.h: moved the #ifndef RC_INVOKED start block up in the file. rc scripts don't need to know thread mutexes. * win/tcl.rc: * win/tclsh.rc: removed the #define RESOURCE_INCLUDED to let the built-in -DRC_INVOKED to the work.
Diffstat (limited to 'win')
-rw-r--r--win/tcl.rc6
-rw-r--r--win/tclsh.rc6
2 files changed, 4 insertions, 8 deletions
diff --git a/win/tcl.rc b/win/tcl.rc
index 315d634..746f5dd 100644
--- a/win/tcl.rc
+++ b/win/tcl.rc
@@ -1,11 +1,9 @@
-// RCS: @(#) $Id: tcl.rc,v 1.7 2001/10/01 20:57:20 hobbs Exp $
+// RCS: @(#) $Id: tcl.rc,v 1.8 2002/06/18 00:12:24 davygrvy Exp $
//
// Version Resource Script
//
#include <winver.h>
-
-#define RESOURCE_INCLUDED
#include <tcl.h>
//
@@ -46,7 +44,7 @@ BEGIN
BLOCK "040904b0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */
BEGIN
VALUE "FileDescription", "Tcl DLL\0"
- VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".dll\0"
+ VALUE "OriginalFilename", "tcl" STRINGIFY(JOIN(TCL_MAJOR_VERSION,TCL_MINOR_VERSION)) SUFFIX ".dll\0"
VALUE "CompanyName", "ActiveState Corporation\0"
VALUE "FileVersion", TCL_PATCH_LEVEL
VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0"
diff --git a/win/tclsh.rc b/win/tclsh.rc
index 0d02804..eaa7270 100644
--- a/win/tclsh.rc
+++ b/win/tclsh.rc
@@ -1,11 +1,9 @@
-// RCS: @(#) $Id: tclsh.rc,v 1.7 2001/10/01 20:57:20 hobbs Exp $
+// RCS: @(#) $Id: tclsh.rc,v 1.8 2002/06/18 00:12:24 davygrvy Exp $
//
// Version Resource Script
//
#include <winver.h>
-
-#define RESOURCE_INCLUDED
#include <tcl.h>
//
@@ -52,7 +50,7 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Tclsh Application\0"
- VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0"
+ VALUE "OriginalFilename", "tclsh" STRINGIFY(JOIN(TCL_MAJOR_VERSION,TCL_MINOR_VERSION)) SUFFIX ".exe\0"
VALUE "CompanyName", "ActiveState Corporation\0"
VALUE "FileVersion", TCL_PATCH_LEVEL
VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0"