diff options
| -rw-r--r-- | win/Makefile.in | 9 | ||||
| -rw-r--r-- | win/configure.in | 25 | ||||
| -rw-r--r-- | win/makefile.vc | 8 | ||||
| -rw-r--r-- | win/rc/tk.rc | 172 | ||||
| -rw-r--r-- | win/rc/tk_base.rc | 130 | ||||
| -rw-r--r-- | win/rc/wish.rc | 54 |
6 files changed, 249 insertions, 149 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 6effcf5..ec0270e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.33 2000/10/31 00:52:28 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.34 2000/10/31 01:28:26 davidg Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -171,6 +171,7 @@ RANLIB = @RANLIB@ CC = @CC@ RC = @RC@ RES = @RES@ +TK_RES = @TK_RES@ AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -524,9 +525,9 @@ ${TK_STUB_LIB_FILE}: ${STUB_OBJS} @MAKE_LIB@ ${STUB_OBJS} @POST_MAKE_LIB@ -${TK_DLL_FILE}: ${TK_OBJS} tk.$(RES) +${TK_DLL_FILE}: ${TK_OBJS} $(TK_RES) @$(RM) ${TK_DLL_FILE} - @MAKE_DLL@ ${TK_OBJS} tk.$(RES) $(SHLIB_LD_LIBS) + @MAKE_DLL@ ${TK_OBJS} $(TK_RES) $(SHLIB_LD_LIBS) ${TK_LIB_FILE}: ${TK_OBJS} @$(RM) ${TK_LIB_FILE} @@ -565,7 +566,7 @@ tclThreadTest.$(OBJEXT): $(TCL_BIN_DIR)/tclThreadTest.$(OBJEXT) $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk ${DEPARG} $(CC_OBJNAME) .rc.$(RES): - $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" $(DEPARG) + $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" $(DEPARG) depend: diff --git a/win/configure.in b/win/configure.in index 711ed7e..3a4a8c8 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.23 2000/09/06 19:05:16 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.24 2000/10/31 01:28:26 davidg Exp $ AC_INIT(../generic/tk.h) @@ -145,6 +145,27 @@ CFG_TK_SHARED_LIB_SUFFIX=${TK_SHARED_LIB_SUFFIX} CFG_TK_UNSHARED_LIB_SUFFIX=${TK_UNSHARED_LIB_SUFFIX} CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX} +#-------------------------------------------------------------------- +# Adjust the defines for how the resources are built depending +# on symbols and static vs. shared. +#-------------------------------------------------------------------- + +if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then + if test "${DBGX}" = "d"; then + RC_DEFINES="-d STATIC_BUILD -d DEBUG" + else + RC_DEFINES="-d STATIC_BUILD" + fi + TK_RES="" +else + if test "${DBGX}" = "d"; then + RC_DEFINES="-d DEBUG" + else + RC_DEFINES="" + fi + TK_RES=tk.res +fi + AC_SUBST(TK_VERSION) AC_SUBST(TK_MAJOR_VERSION) AC_SUBST(TK_MINOR_VERSION) @@ -200,6 +221,8 @@ AC_SUBST(RC) AC_SUBST(RC_OUT) AC_SUBST(RC_TYPE) AC_SUBST(RC_INCLUDE) +AC_SUBST(RC_DEFINES) +AC_SUBST(TK_RES) AC_SUBST(RES) AC_SUBST(LIBS) AC_SUBST(LIBS_GUI) diff --git a/win/makefile.vc b/win/makefile.vc index 6e99c1c..ede6237 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# RCS: @(#) $Id: makefile.vc,v 1.37 2000/09/02 01:18:24 ericm Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.38 2000/10/31 01:28:26 davidg Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -457,7 +457,11 @@ $(TMPDIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c {$(RCDIR)}.rc{$(TMPDIR)}.res: $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TOOLS32)\include" \ - -i "$(TCLDIR)\generic" $< + -i "$(TCLDIR)\generic" \ +!if "$(NODEBUG)" == "0" + -d DEBUG \ +!endif + $< clean: -@del $(OUTDIR)\*.exp diff --git a/win/rc/tk.rc b/win/rc/tk.rc index 0d96b84..9641bc8 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,22 +1,46 @@ -// RCS: @(#) $Id: tk.rc,v 1.5 2000/04/18 23:28:01 redman Exp $ +// RCS: @(#) $Id: tk.rc,v 1.6 2000/10/31 01:28:27 davidg Exp $ // -// Version +// Version Resource Script // #include <windows.h> + #define RESOURCE_INCLUDED #include <tk.h> -#define STRINGIFY1(x) #x -#define STRINGIFY(x) STRINGIFY1(x) - -VS_VERSION_INFO VERSIONINFO - FILEVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL - PRODUCTVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL +#define STRINGIFY1(x) #x +#define STRINGIFY(x) STRINGIFY1(x) + + +// +// build-up the name suffix that defines the type of build this is. +// +#ifdef TCL_THREADS +#define SUFFIX_THREADS "t" +#else +#define SUFFIX_THREADS "" +#endif + +#ifdef DEBUG +#define SUFFIX_DEBUG "d" +#else +#define SUFFIX_DEBUG "" +#endif + +#define SUFFIX SUFFIX_THREADS SUFFIX_DEBUG + + +VS_VERSION_INFO VERSIONINFO + FILEVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL + PRODUCTVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL FILEFLAGSMASK 0x3fL +#ifdef DEBUG + FILEFLAGS VS_FF_DEBUG +#else FILEFLAGS 0x0L - FILEOS 0x4L - FILETYPE 0x2L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" @@ -24,10 +48,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tk DLL\0" - VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) ".dll\0" - VALUE "CompanyName", "Scriptics Corporation\0" + VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".dll\0" + VALUE "CompanyName", "Ajuba Solutions\0" VALUE "FileVersion", TK_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright \251 2000 by Scriptics Corporation\0" + VALUE "LegalCopyright", "Copyright \251 2000 by Ajuba Solutions\0" VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" VALUE "ProductVersion", TK_PATCH_LEVEL END @@ -38,126 +62,8 @@ BEGIN END END -#include <dlgs.h> -FILEOPENORD DIALOG DISCARDABLE 36, 24, 218, 138 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Choose Directory" -FONT 8, "Helv" -BEGIN - LTEXT "Directory &name:",-1,8,6,118,9 - EDITTEXT edt10,8,26,144,12, WS_TABSTOP | ES_AUTOHSCROLL - LISTBOX lst2,8,40,144,64,LBS_SORT | LBS_OWNERDRAWFIXED | - LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | - LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Dri&ves:",stc4,8,106,92,9 - COMBOBOX cmb2,8,115,144,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | - CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | - WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",1,160,6,50,14,WS_GROUP - PUSHBUTTON "Cancel",2,160,24,50,14,WS_GROUP - PUSHBUTTON "&Help",psh15,160,42,50,14,WS_GROUP - CHECKBOX "&Read only",chx1,160,66,50,12,WS_GROUP - PUSHBUTTON "Net&work...",psh14,160,115,50,14,WS_GROUP - - LTEXT "a",stc3,9,143,114,15 - EDITTEXT edt1,7,158,135,20,NOT WS_TABSTOP - LISTBOX lst1,8,205,134,42,LBS_NOINTEGRALHEIGHT - COMBOBOX cmb1,8,253,135,21,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | - CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | - WS_VSCROLL - -END - -// -// Icons -// - -tk ICON DISCARDABLE "tk.ico" - -// -// Bitmaps -// - -buttons BITMAP DISCARDABLE "buttons.bmp" - // -// Cursors +// Include the base resources. // -X_cursor CURSOR DISCARDABLE "cursor00.cur" -arrow CURSOR DISCARDABLE "cursor02.cur" -based_arrow_down CURSOR DISCARDABLE "cursor04.cur" -based_arrow_up CURSOR DISCARDABLE "cursor06.cur" -boat CURSOR DISCARDABLE "cursor08.cur" -bogosity CURSOR DISCARDABLE "cursor0a.cur" -bottom_left_corner CURSOR DISCARDABLE "cursor0c.cur" -bottom_right_corner CURSOR DISCARDABLE "cursor0e.cur" -bottom_side CURSOR DISCARDABLE "cursor10.cur" -bottom_tee CURSOR DISCARDABLE "cursor12.cur" -box_spiral CURSOR DISCARDABLE "cursor14.cur" -center_ptr CURSOR DISCARDABLE "cursor16.cur" -circle CURSOR DISCARDABLE "cursor18.cur" -clock CURSOR DISCARDABLE "cursor1a.cur" -coffee_mug CURSOR DISCARDABLE "cursor1c.cur" -cross CURSOR DISCARDABLE "cursor1e.cur" -cross_reverse CURSOR DISCARDABLE "cursor20.cur" -crosshair CURSOR DISCARDABLE "cursor22.cur" -diamond_cross CURSOR DISCARDABLE "cursor24.cur" -dot CURSOR DISCARDABLE "cursor26.cur" -dotbox CURSOR DISCARDABLE "cursor28.cur" -double_arrow CURSOR DISCARDABLE "cursor2a.cur" -draft_large CURSOR DISCARDABLE "cursor2c.cur" -draft_small CURSOR DISCARDABLE "cursor2e.cur" -draped_box CURSOR DISCARDABLE "cursor30.cur" -exchange CURSOR DISCARDABLE "cursor32.cur" -fleur CURSOR DISCARDABLE "cursor34.cur" -gobbler CURSOR DISCARDABLE "cursor36.cur" -gumby CURSOR DISCARDABLE "cursor38.cur" -hand1 CURSOR DISCARDABLE "cursor3a.cur" -hand2 CURSOR DISCARDABLE "cursor3c.cur" -heart CURSOR DISCARDABLE "cursor3e.cur" -icon CURSOR DISCARDABLE "cursor40.cur" -iron_cross CURSOR DISCARDABLE "cursor42.cur" -left_ptr CURSOR DISCARDABLE "cursor44.cur" -left_side CURSOR DISCARDABLE "cursor46.cur" -left_tee CURSOR DISCARDABLE "cursor48.cur" -leftbutton CURSOR DISCARDABLE "cursor4a.cur" -ll_angle CURSOR DISCARDABLE "cursor4c.cur" -lr_angle CURSOR DISCARDABLE "cursor4e.cur" -man CURSOR DISCARDABLE "cursor50.cur" -middlebutton CURSOR DISCARDABLE "cursor52.cur" -mouse CURSOR DISCARDABLE "cursor54.cur" -pencil CURSOR DISCARDABLE "cursor56.cur" -pirate CURSOR DISCARDABLE "cursor58.cur" -plus CURSOR DISCARDABLE "cursor5a.cur" -question_arrow CURSOR DISCARDABLE "cursor5c.cur" -right_ptr CURSOR DISCARDABLE "cursor5e.cur" -right_side CURSOR DISCARDABLE "cursor60.cur" -right_tee CURSOR DISCARDABLE "cursor62.cur" -rightbutton CURSOR DISCARDABLE "cursor64.cur" -rtl_logo CURSOR DISCARDABLE "cursor66.cur" -sailboat CURSOR DISCARDABLE "cursor68.cur" -sb_down_arrow CURSOR DISCARDABLE "cursor6a.cur" -sb_h_double_arrow CURSOR DISCARDABLE "cursor6c.cur" -sb_left_arrow CURSOR DISCARDABLE "cursor6e.cur" -sb_right_arrow CURSOR DISCARDABLE "cursor70.cur" -sb_up_arrow CURSOR DISCARDABLE "cursor72.cur" -sb_v_double_arrow CURSOR DISCARDABLE "cursor74.cur" -shuttle CURSOR DISCARDABLE "cursor76.cur" -sizing CURSOR DISCARDABLE "cursor78.cur" -spider CURSOR DISCARDABLE "cursor7a.cur" -spraycan CURSOR DISCARDABLE "cursor7c.cur" -star CURSOR DISCARDABLE "cursor7e.cur" -target CURSOR DISCARDABLE "cursor80.cur" -tcross CURSOR DISCARDABLE "cursor82.cur" -top_left_arrow CURSOR DISCARDABLE "cursor84.cur" -top_left_corner CURSOR DISCARDABLE "cursor86.cur" -top_right_corner CURSOR DISCARDABLE "cursor88.cur" -top_side CURSOR DISCARDABLE "cursor8a.cur" -top_tee CURSOR DISCARDABLE "cursor8c.cur" -trek CURSOR DISCARDABLE "cursor8e.cur" -ul_angle CURSOR DISCARDABLE "cursor90.cur" -umbrella CURSOR DISCARDABLE "cursor92.cur" -ur_angle CURSOR DISCARDABLE "cursor94.cur" -watch CURSOR DISCARDABLE "cursor96.cur" -xterm CURSOR DISCARDABLE "cursor98.cur" +#include "tk_base.rc" diff --git a/win/rc/tk_base.rc b/win/rc/tk_base.rc new file mode 100644 index 0000000..7a8a2eb --- /dev/null +++ b/win/rc/tk_base.rc @@ -0,0 +1,130 @@ +// RCS: @(#) $Id: tk_base.rc,v 1.2 2000/10/31 01:28:27 davidg Exp $ +// +// Base resources needed by Tk whether it's a DLL or a static library. +// + +// +// Tk Icon +// + +tk ICON DISCARDABLE "tk.ico" + +#include <dlgs.h> + +FILEOPENORD DIALOG DISCARDABLE 36, 24, 218, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Choose Directory" +FONT 8, "Helv" +BEGIN + LTEXT "Directory &name:",-1,8,6,118,9 + EDITTEXT edt10,8,26,144,12, WS_TABSTOP | ES_AUTOHSCROLL + LISTBOX lst2,8,40,144,64,LBS_SORT | LBS_OWNERDRAWFIXED | + LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | + LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP + LTEXT "Dri&ves:",stc4,8,106,92,9 + COMBOBOX cmb2,8,115,144,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | + CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | + WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",1,160,6,50,14,WS_GROUP + PUSHBUTTON "Cancel",2,160,24,50,14,WS_GROUP + PUSHBUTTON "&Help",psh15,160,42,50,14,WS_GROUP + CHECKBOX "&Read only",chx1,160,66,50,12,WS_GROUP + PUSHBUTTON "Net&work...",psh14,160,115,50,14,WS_GROUP + + LTEXT "a",stc3,9,143,114,15 + EDITTEXT edt1,7,158,135,20,NOT WS_TABSTOP + LISTBOX lst1,8,205,134,42,LBS_NOINTEGRALHEIGHT + COMBOBOX cmb1,8,253,135,21,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | + CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | + WS_VSCROLL + +END + + +// +// Bitmaps +// + +buttons BITMAP DISCARDABLE "buttons.bmp" + +// +// Cursors +// + +X_cursor CURSOR DISCARDABLE "cursor00.cur" +arrow CURSOR DISCARDABLE "cursor02.cur" +based_arrow_down CURSOR DISCARDABLE "cursor04.cur" +based_arrow_up CURSOR DISCARDABLE "cursor06.cur" +boat CURSOR DISCARDABLE "cursor08.cur" +bogosity CURSOR DISCARDABLE "cursor0a.cur" +bottom_left_corner CURSOR DISCARDABLE "cursor0c.cur" +bottom_right_corner CURSOR DISCARDABLE "cursor0e.cur" +bottom_side CURSOR DISCARDABLE "cursor10.cur" +bottom_tee CURSOR DISCARDABLE "cursor12.cur" +box_spiral CURSOR DISCARDABLE "cursor14.cur" +center_ptr CURSOR DISCARDABLE "cursor16.cur" +circle CURSOR DISCARDABLE "cursor18.cur" +clock CURSOR DISCARDABLE "cursor1a.cur" +coffee_mug CURSOR DISCARDABLE "cursor1c.cur" +cross CURSOR DISCARDABLE "cursor1e.cur" +cross_reverse CURSOR DISCARDABLE "cursor20.cur" +crosshair CURSOR DISCARDABLE "cursor22.cur" +diamond_cross CURSOR DISCARDABLE "cursor24.cur" +dot CURSOR DISCARDABLE "cursor26.cur" +dotbox CURSOR DISCARDABLE "cursor28.cur" +double_arrow CURSOR DISCARDABLE "cursor2a.cur" +draft_large CURSOR DISCARDABLE "cursor2c.cur" +draft_small CURSOR DISCARDABLE "cursor2e.cur" +draped_box CURSOR DISCARDABLE "cursor30.cur" +exchange CURSOR DISCARDABLE "cursor32.cur" +fleur CURSOR DISCARDABLE "cursor34.cur" +gobbler CURSOR DISCARDABLE "cursor36.cur" +gumby CURSOR DISCARDABLE "cursor38.cur" +hand1 CURSOR DISCARDABLE "cursor3a.cur" +hand2 CURSOR DISCARDABLE "cursor3c.cur" +heart CURSOR DISCARDABLE "cursor3e.cur" +icon CURSOR DISCARDABLE "cursor40.cur" +iron_cross CURSOR DISCARDABLE "cursor42.cur" +left_ptr CURSOR DISCARDABLE "cursor44.cur" +left_side CURSOR DISCARDABLE "cursor46.cur" +left_tee CURSOR DISCARDABLE "cursor48.cur" +leftbutton CURSOR DISCARDABLE "cursor4a.cur" +ll_angle CURSOR DISCARDABLE "cursor4c.cur" +lr_angle CURSOR DISCARDABLE "cursor4e.cur" +man CURSOR DISCARDABLE "cursor50.cur" +middlebutton CURSOR DISCARDABLE "cursor52.cur" +mouse CURSOR DISCARDABLE "cursor54.cur" +pencil CURSOR DISCARDABLE "cursor56.cur" +pirate CURSOR DISCARDABLE "cursor58.cur" +plus CURSOR DISCARDABLE "cursor5a.cur" +question_arrow CURSOR DISCARDABLE "cursor5c.cur" +right_ptr CURSOR DISCARDABLE "cursor5e.cur" +right_side CURSOR DISCARDABLE "cursor60.cur" +right_tee CURSOR DISCARDABLE "cursor62.cur" +rightbutton CURSOR DISCARDABLE "cursor64.cur" +rtl_logo CURSOR DISCARDABLE "cursor66.cur" +sailboat CURSOR DISCARDABLE "cursor68.cur" +sb_down_arrow CURSOR DISCARDABLE "cursor6a.cur" +sb_h_double_arrow CURSOR DISCARDABLE "cursor6c.cur" +sb_left_arrow CURSOR DISCARDABLE "cursor6e.cur" +sb_right_arrow CURSOR DISCARDABLE "cursor70.cur" +sb_up_arrow CURSOR DISCARDABLE "cursor72.cur" +sb_v_double_arrow CURSOR DISCARDABLE "cursor74.cur" +shuttle CURSOR DISCARDABLE "cursor76.cur" +sizing CURSOR DISCARDABLE "cursor78.cur" +spider CURSOR DISCARDABLE "cursor7a.cur" +spraycan CURSOR DISCARDABLE "cursor7c.cur" +star CURSOR DISCARDABLE "cursor7e.cur" +target CURSOR DISCARDABLE "cursor80.cur" +tcross CURSOR DISCARDABLE "cursor82.cur" +top_left_arrow CURSOR DISCARDABLE "cursor84.cur" +top_left_corner CURSOR DISCARDABLE "cursor86.cur" +top_right_corner CURSOR DISCARDABLE "cursor88.cur" +top_side CURSOR DISCARDABLE "cursor8a.cur" +top_tee CURSOR DISCARDABLE "cursor8c.cur" +trek CURSOR DISCARDABLE "cursor8e.cur" +ul_angle CURSOR DISCARDABLE "cursor90.cur" +umbrella CURSOR DISCARDABLE "cursor92.cur" +ur_angle CURSOR DISCARDABLE "cursor94.cur" +watch CURSOR DISCARDABLE "cursor96.cur" +xterm CURSOR DISCARDABLE "cursor98.cur" diff --git a/win/rc/wish.rc b/win/rc/wish.rc index 3120d9b..74c40ed 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -1,7 +1,8 @@ -// RCS: @(#) $Id: wish.rc,v 1.4 2000/04/18 23:28:01 redman Exp $ +// RCS: @(#) $Id: wish.rc,v 1.5 2000/10/31 01:28:27 davidg Exp $ // -// Version +// Version Resource Script // + #include <windows.h> #define RESOURCE_INCLUDED @@ -9,14 +10,42 @@ #define STRINGIFY1(x) #x #define STRINGIFY(x) STRINGIFY1(x) - + +// +// build-up the name suffix that defines the type of build this is. +// +#ifdef TCL_THREADS +#define SUFFIX_THREADS "t" +#else +#define SUFFIX_THREADS "" +#endif + +#ifdef STATIC_BUILD +#define SUFFIX_STATIC "s" +#else +#define SUFFIX_STATIC "" +#endif + +#ifdef DEBUG +#define SUFFIX_DEBUG "d" +#else +#define SUFFIX_DEBUG "" +#endif + +#define SUFFIX SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG + + VS_VERSION_INFO VERSIONINFO FILEVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL PRODUCTVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL FILEFLAGSMASK 0x3fL +#ifdef DEBUG + FILEFLAGS VS_FF_DEBUG +#else FILEFLAGS 0x0L - FILEOS 0x4L - FILETYPE 0x1L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" @@ -24,10 +53,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Wish Application\0" - VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) ".exe\0" - VALUE "CompanyName", "Scriptics Corporation\0" + VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "CompanyName", "Ajuba Solutions\0" VALUE "FileVersion", TK_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright \251 2000 by Scriptics Corporation\0" + VALUE "LegalCopyright", "Copyright \251 2000 by Ajuba Solutions\0" VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" VALUE "ProductVersion", TK_PATCH_LEVEL END @@ -40,6 +69,13 @@ END // // Icon +// +// The icon whose name or resource ID is lexigraphically first, is used +// as the application's icon. // -wish ICON DISCARDABLE "wish.ico" +app ICON DISCARDABLE "wish.ico" + +#ifdef STATIC_BUILD +#include "tk_base.rc" +#endif |