From: Pat Thoyts Date: Mon, 23 Feb 2004 02:00:11 +0000 (+0000) Subject: * win/makefile.vc: Added a version resource and a few more fixes X-Git-Tag: random-1-2-0 X-Git-Url: https://privyetmir.co.uk/gitweb.cgi?a=commitdiff_plain;h=cd280f106a9f7a21739153e68dbbc8be65572444;p=Random * win/makefile.vc: Added a version resource and a few more fixes * generic/random.h: for building under VC++ in debug mode. --- diff --git a/ChangeLog b/ChangeLog index a41502b..485e954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-02-23 Pat Thoyts + * win/makefile.vc: Added a version resource and a few more fixes + * generic/random.h: for building under VC++ in debug mode. + * win/makefile.vc: Added VC++ build files. * win/rules.vc: * win/nmakehlp.c: diff --git a/generic/random.h b/generic/random.h index 274ed2c..79b67da 100644 --- a/generic/random.h +++ b/generic/random.h @@ -9,6 +9,8 @@ #define _random_h_INCLUDE #include +#include +#include #ifdef BUILD_Random #undef TCL_STORAGE_CLASS diff --git a/win/Random.rc b/win/Random.rc new file mode 100644 index 0000000..54242c6 --- /dev/null +++ b/win/Random.rc @@ -0,0 +1,34 @@ +// SCCS: @(#) memchan.rc 1.0 96/04/12 18:08:09 +// +// Version +// + +#include + +VS_VERSION_INFO VERSIONINFO + FILEVERSION COMMAVERSION + PRODUCTVERSION COMMAVERSION + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Random Tcl extension\0" + VALUE "OriginalFilename", "Random" VERSION ".dll\0" + VALUE "CompanyName", "Pat Thoyts\0" + VALUE "FileVersion", DOTVERSION "\0" + VALUE "LegalCopyright", "Copyright \251 2003 Pat Thoyts\0" + VALUE "ProductName", "Tcl Random extension\0" + VALUE "ProductVersion", DOTVERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/win/makefile.vc b/win/makefile.vc index 12ef157..d8dc918 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -158,6 +158,7 @@ PROJECT = Random DOTVERSION = 1.2.0 VERSION = $(DOTVERSION:.=) +COMMAVERSION = $(DOTVERSION:.=,),0 STUBPREFIX = $(PROJECT)stub DLLOBJS = \ @@ -167,6 +168,8 @@ DLLOBJS = \ $(TMP_DIR)\rand_isaac.obj \ $(TMP_DIR)\randport.obj +RCRES = $(TMP_DIR)\Random.res + #------------------------------------------------------------------------- # Target names and paths ( shouldn't need changing ) #------------------------------------------------------------------------- @@ -315,7 +318,7 @@ setup: @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) @if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR) -$(PRJLIB): $(DLLOBJS) +$(PRJLIB): $(DLLOBJS) $(RCRES) $(link32) $(dlllflags) -out:$@ $(baselibs) @<< $** << @@ -350,6 +353,9 @@ $< {$(WINDIR)}.rc{$(TMP_DIR)}.res: $(rc32) -fo $@ -r -i "$(GENERICDIR)" -D__WIN32__ \ + -DCOMMAVERSION=$(COMMAVERSION) \ + -DDOTVERSION=\"$(DOTVERSION)\" \ + -DVERSION=\"$(VERSION)$(SUFX)\" \ !if $(DEBUG) -d DEBUG \ !endif