adding support for different windows compiler

Eric kindly provided us with some makefiles for different windows compiler and also fixed some issues that came up while using those compilers.

diff --git a/AUTHORS b/AUTHORS
index d2bad82..25e88e6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,143 +1,149 @@
-Contributions of xboard and WinBoard authors by file\r
-$Id: AUTHORS,v 1.1 2003/11/02 04:42:06 mann Exp $\r
-\r
-0. Files covered\r
-\r
-The first group are included in the xboard distribution.  The second\r
-group are included in the WinBoard source distribution but not in the\r
-xboard distribution.  All are part of the joint xboard/WinBoard source\r
-base and are covered by the same copyrights and licensing terms.\r
-\r
-FAQ.html\r
-backend.c\r
-backend.h\r
-backendz.h\r
-bitmaps\r
-childio.c\r
-childio.h\r
-cmail.in\r
-cmail.man\r
-comment.in\r
-common.h\r
-config.h.in\r
-configure.in\r
-engine-intf.txt\r
-frontend.h\r
-gamelist.c\r
-ics-parsing.txt\r
-lists.c\r
-lists.h\r
-moves.c\r
-moves.h\r
-parser.h\r
-parser.l\r
-pgntags.c\r
-xboard.c\r
-xboard.h\r
-xboard.man\r
-xboard.texi\r
-xedittags.c\r
-xedittags.h\r
-xgamelist.c\r
-xgamelist.h\r
-zic2xpm.c\r
-zic2xpm.man\r
-zippy.README\r
-zippy.c\r
-zippy.h\r
-\r
-winboard.rtf (compiles to winboard.hlp)\r
-config.h\r
-defaults.h\r
-resource.h\r
-wedittags.c\r
-wedittags.h\r
-wgamelist.c\r
-wgamelist.h\r
-winboard.c\r
-winboard.h\r
-winboard.rc\r
-\r
-bitmaps/*\r
-bitmaps.xchess/*\r
-\r
-1. Wayne Christopher\r
-\r
-Wrote from scratch (I believe) bitmaps.xchess/*80*.bm.  Other bitmaps\r
-in the bitmaps.xchess directory were derived from these by shrinking\r
-and some hand-tuning.  By default these bitmaps are no longer used.\r
-Their copyright status is unclear.\r
-\r
-2. Chris Sears and Dan Sears\r
-\r
-Wrote from scratch parser.l, xboard.c, xboard.h, xboard.man.  Parts\r
-(sometimes small) of these files were later moved by Tim Mann to\r
-backend.c, backend.h, childio.c, common.h, frontend.h, and parser.h.\r
-\r
-Chris and Dan's original work is copyrighted by Digital Equipment\r
-Corporation with licensing terms similar to what the X Consortium uses\r
-(see the file COPYRIGHT).  All the work listed below is copyrighted by\r
-the Free Software Foundation and covered by the GPL (see the files\r
-COPYRIGHT and COPYING).\r
-\r
-3. Tim Mann <tim@tim-mann.org>\r
-\r
-Wrote from scratch FAQ.html, backendz.h, childio.h, comment.in,\r
-config.h.in, configure.in, engine-intf.txt, ics-parsing.txt, moves.c,\r
-moves.h, pgntags.c (split from backend.c by Jochen Wiedmann),\r
-xedittags.c, xedittags.h, xgamelist.c, xgamelist.h, zippy.README,\r
-zippy.c, zippy.h, winboard.rtf, config.h, defaults.h, resource.h,\r
-wedittags.c, wedittags.h, wgamelist.c, wgamelist.h, winboard.c,\r
-winboard.h, winboard.rc.\r
-\r
-Major additions and changes to nearly all other files listed in\r
-section 0.\r
-\r
-4. John Chanak\r
-\r
-Addition to xboard.c, mostly later moved into backend.c.\r
-\r
-5. Evan Welsh <Evan.Welsh@msdw.com>\r
-\r
-Wrote from scratch cmail.in and cmail.man.  Additions to backend.c and\r
-xboard.c.\r
-\r
-6. Elmar Bartel <bartel@informatik.tu-muenchen.de>\r
-\r
-Wrote from scratch the Metafont code from which bitmaps/* were\r
-generated.  The Metafont code itself is not included in the package.\r
-\r
-7. Jochen Wiedmann\r
-\r
-Wrote from scratch gamelist.c, lists.c, lists.h.  Wrote xboard.texi,\r
-mostly based on xboard.man and cmail.man.  Minor additions to backend.c.\r
-\r
-8. Frank McIngvale <frankm@hiwaay.net>\r
-\r
-Wrote from scratch zic2xpm.c and zic2xpm.man.  Additions to backend.c,\r
-xboard.c, and xboard.man.\r
-\r
-9. Hugh Fisher <Hugh.Fisher@cs.anu.edu.au>\r
-\r
-Additions to backend.c and xboard.c.\r
-\r
-10. Allessandro Scotti\r
-\r
-Made many additions to the WinBoard user interface and graphics \r
-capabilities, such as new windows for engine output, board textures \r
-and font-based piece rendering. These changes became collectively known\r
-as Winboard_x.\r
-\r
-11. H.G. Muller <h.g.muller AT hccnet DOT nl>\r
-\r
-Heaviliy modified winboard.c, backend.c, moves.c and parser.l, to\r
-allow board sizes other than 8x8, and many non-orthodox Chess pieces,\r
-so that WinBoard is now capable of playing variants like Shogi and Xiangqi.\r
-Also implemented displaying of the Crazyhouse holdings, and many adjudication\r
-and other backend options. This version of WinBoard, (4.3.xx) containing all \r
-of the WinBoard_x options, became known as WinBoard_F.\r
-\r
-12. Arun Persaud <arun AT nubati DOT net> \r
- \r
-fix for parser.l\r
-updated autotools files
\ No newline at end of file
+Contributions of xboard and WinBoard authors by file
+$Id: AUTHORS,v 1.1 2003/11/02 04:42:06 mann Exp $
+
+0. Files covered
+
+The first group are included in the xboard distribution.  The second
+group are included in the WinBoard source distribution but not in the
+xboard distribution.  All are part of the joint xboard/WinBoard source
+base and are covered by the same copyrights and licensing terms.
+
+FAQ.html
+backend.c
+backend.h
+backendz.h
+bitmaps
+childio.c
+childio.h
+cmail.in
+cmail.man
+comment.in
+common.h
+config.h.in
+configure.in
+engine-intf.txt
+frontend.h
+gamelist.c
+ics-parsing.txt
+lists.c
+lists.h
+moves.c
+moves.h
+parser.h
+parser.l
+pgntags.c
+xboard.c
+xboard.h
+xboard.man
+xboard.texi
+xedittags.c
+xedittags.h
+xgamelist.c
+xgamelist.h
+zic2xpm.c
+zic2xpm.man
+zippy.README
+zippy.c
+zippy.h
+
+winboard.rtf (compiles to winboard.hlp)
+config.h
+defaults.h
+resource.h
+wedittags.c
+wedittags.h
+wgamelist.c
+wgamelist.h
+winboard.c
+winboard.h
+winboard.rc
+
+bitmaps/*
+bitmaps.xchess/*
+
+1. Wayne Christopher
+
+Wrote from scratch (I believe) bitmaps.xchess/*80*.bm.  Other bitmaps
+in the bitmaps.xchess directory were derived from these by shrinking
+and some hand-tuning.  By default these bitmaps are no longer used.
+Their copyright status is unclear.
+
+2. Chris Sears and Dan Sears
+
+Wrote from scratch parser.l, xboard.c, xboard.h, xboard.man.  Parts
+(sometimes small) of these files were later moved by Tim Mann to
+backend.c, backend.h, childio.c, common.h, frontend.h, and parser.h.
+
+Chris and Dan's original work is copyrighted by Digital Equipment
+Corporation with licensing terms similar to what the X Consortium uses
+(see the file COPYRIGHT).  All the work listed below is copyrighted by
+the Free Software Foundation and covered by the GPL (see the files
+COPYRIGHT and COPYING).
+
+3. Tim Mann <tim@tim-mann.org>
+
+Wrote from scratch FAQ.html, backendz.h, childio.h, comment.in,
+config.h.in, configure.in, engine-intf.txt, ics-parsing.txt, moves.c,
+moves.h, pgntags.c (split from backend.c by Jochen Wiedmann),
+xedittags.c, xedittags.h, xgamelist.c, xgamelist.h, zippy.README,
+zippy.c, zippy.h, winboard.rtf, config.h, defaults.h, resource.h,
+wedittags.c, wedittags.h, wgamelist.c, wgamelist.h, winboard.c,
+winboard.h, winboard.rc.
+
+Major additions and changes to nearly all other files listed in
+section 0.
+
+4. John Chanak
+
+Addition to xboard.c, mostly later moved into backend.c.
+
+5. Evan Welsh <Evan.Welsh@msdw.com>
+
+Wrote from scratch cmail.in and cmail.man.  Additions to backend.c and
+xboard.c.
+
+6. Elmar Bartel <bartel@informatik.tu-muenchen.de>
+
+Wrote from scratch the Metafont code from which bitmaps/* were
+generated.  The Metafont code itself is not included in the package.
+
+7. Jochen Wiedmann
+
+Wrote from scratch gamelist.c, lists.c, lists.h.  Wrote xboard.texi,
+mostly based on xboard.man and cmail.man.  Minor additions to backend.c.
+
+8. Frank McIngvale <frankm@hiwaay.net>
+
+Wrote from scratch zic2xpm.c and zic2xpm.man.  Additions to backend.c,
+xboard.c, and xboard.man.
+
+9. Hugh Fisher <Hugh.Fisher@cs.anu.edu.au>
+
+Additions to backend.c and xboard.c.
+
+10. Allessandro Scotti
+
+Made many additions to the WinBoard user interface and graphics 
+capabilities, such as new windows for engine output, board textures 
+and font-based piece rendering. These changes became collectively known
+as Winboard_x.
+
+11. H.G. Muller <h.g.muller AT hccnet DOT nl>
+
+Heaviliy modified winboard.c, backend.c, moves.c and parser.l, to
+allow board sizes other than 8x8, and many non-orthodox Chess pieces,
+so that WinBoard is now capable of playing variants like Shogi and Xiangqi.
+Also implemented displaying of the Crazyhouse holdings, and many adjudication
+and other backend options. This version of WinBoard, (4.3.xx) containing all 
+of the WinBoard_x options, became known as WinBoard_F.
+
+12. Arun Persaud <arun AT nubati DOT net> 
+ 
+fix for parser.l
+updated autotools files
+
+13. Eric Mullins <emwine AT earthlink DOT net>
+
+Makefiles for different compilers for windows, several changes for those compilers
+
+backend.c, winboard/Winboard.dev, winboard/makefile.gcc, winboard/makefile.ms, winboard/res/winboard.exe.manifest, winboard/resource.h, winboard/wevalgraph.c, winboard/winboard.c, winboard/winboard.dsp, winboard/winboard.dsw, winboard/winboard.h, winboard/winboard.rc, winboard/woptions.c                

diff --git a/backend.c b/backend.c
index 9c49e05..5ae5525 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -12899,6 +12899,11 @@ DisplayBothClocks()
    you have neither ftime nor gettimeofday.\r
 */\r
 \r
    you have neither ftime nor gettimeofday.\r
 */\r
 \r

+/* VS 2008 requires the #include outside of the function */\r
+#if !HAVE_GETTIMEOFDAY && HAVE_FTIME\r
+#include <sys/timeb.h>\r
+#endif\r
+\r

 /* Get the current time as a TimeMark */\r
 void\r
 GetTimeMark(tm)\r
 /* Get the current time as a TimeMark */\r
 void\r
 GetTimeMark(tm)\r

diff --git a/winboard/Winboard.dev b/winboard/Winboard.dev
new file mode 100644 (file)
index 0000000..5961142
--- /dev/null
+++ b/winboard/Winboard.dev
@@ -0,0 +1,258 @@
+[Project]\r
+FileName=Winboard.dev\r
+Name=Winboard\r
+UnitCount=21\r
+Type=0\r
+Ver=1\r
+ObjFiles=\r
+Includes=\r
+Libs=\r
+PrivateResource=Winboard_private.rc\r
+ResourceIncludes=..\r
+MakeIncludes=\r
+Compiler=-I.._@@_-I._@@_\r
+CppCompiler=\r
+Linker=-fpic_@@_-s_@@_-mwindows_@@_-lwsock32_@@_-lwinmm_@@_-lcomctl32_@@_\r
+IsCpp=0\r
+Icon=\r
+ExeOutput=\r
+ObjectOutput=\r
+OverrideOutput=0\r
+OverrideOutputName=Winboard.exe\r
+HostApplication=\r
+Folders=\r
+CommandLine=\r
+UseCustomMakefile=0\r
+CustomMakefile=makefile.gcc\r
+IncludeVersionInfo=1\r
+SupportXPThemes=0\r
+CompilerSet=0\r
+CompilerSettings=0000000000001000000100\r
+\r
+[Unit1]\r
+FileName=wsockerr.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit2]\r
+FileName=parser.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit3]\r
+FileName=wclipbrd.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit4]\r
+FileName=wedittags.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit5]\r
+FileName=wengineo.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit6]\r
+FileName=wevalgraph.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit7]\r
+FileName=wgamelist.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit8]\r
+FileName=whistory.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit9]\r
+FileName=winboard.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit10]\r
+FileName=wlayout.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit11]\r
+FileName=woptions.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit12]\r
+FileName=wsnap.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit13]\r
+FileName=..\uci.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit14]\r
+FileName=..\backend.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit15]\r
+FileName=..\book.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit16]\r
+FileName=..\gamelist.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit17]\r
+FileName=..\lists.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit18]\r
+FileName=..\moves.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit19]\r
+FileName=..\pgntags.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit20]\r
+FileName=winboard.rc\r
+Folder=Winboard\r
+Compile=1\r
+Link=0\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[VersionInfo]\r
+Major=4\r
+Minor=4\r
+Release=0\r
+Build=1\r
+LanguageID=1033\r
+CharsetID=1252\r
+CompanyName=\r
+FileVersion=4.4.0j\r
+FileDescription=Developed using the Dev-C++ IDE\r
+InternalName=winboard.exe\r
+LegalCopyright=GPLv2\r
+LegalTrademarks=\r
+OriginalFilename=winboard.exe\r
+ProductName=Winboard\r
+ProductVersion=4.4.0j\r
+AutoIncBuildNr=0\r
+\r
+[Unit21]\r
+FileName=..\zippy.c\r
+CompileCpp=0\r
+Folder=Winboard\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
new file mode 100644 (file)
index 0000000..5bd49dd
--- /dev/null
+++ b/winboard/makefile.gcc
@@ -0,0 +1,159 @@
+# WinBoard makefile using gcc\r
+\r
+\r
+PROJ=winboard\r
+\r
+\r
+OBJS=backend.o book.o gamelist.o lists.o moves.o pgntags.o uci.o zippy.o\\r
+ parser.o wbres.o wclipbrd.o wedittags.o wengineo.o wevalgraph.o\\r
+ wgamelist.o whistory.o winboard.o wlayout.o woptions.o wsnap.o\\r
+ wsockerr.o\r
+\r
+\r
+# make compiling less spammy\r
+compile = @echo "$1"; $(CC) $(CFLAGS) $1\r
+\r
+\r
+# Debugging?\r
+USE_DEBUG=0\r
+\r
+\r
+# set this to 1 unless you don't mind linking with cygwin1.dll\r
+USE_MINGW=1\r
+\r
+\r
+# set up for cygwin or not\r
+ifeq ($(USE_MINGW),1)\r
+CFCYG = -mno-cygwin\r
+LFCYG = -mno-cygwin -lmsvcrt\r
+endif\r
+\r
+\r
+CC = gcc\r
+FLEX = "flex.exe" # we need version 2.5.4 or later, cygwin's is 2.5.35\r
+#      "c:/mingw/mingw32/bin/flex.exe"\r
+HC="C:/Program Files/Help Workshop/hcrtf" -xn\r
+DEFS = -D_WIN32_IE=0x0300 -DWIN32\r
+WARN = -Wall -Wno-char-subscripts -Wno-parentheses\r
+ARCH =\r
+ifeq ($(USE_DEBUG),0)\r
+  CFDEBUG = -DNDEBUG\r
+  OPTS = -Os -frename-registers -funit-at-a-time -fstrict-aliasing -fstrength-reduce\r
+else\r
+  CFDEBUG = -D_DEBUG -DDEBUG -g\r
+endif\r
+CF = -c $(WARN) -pipe $(CFDEBUG) $(DEFS) -I. -I..\r
+CFLAGS = $(CF) $(ARCH) $(OPTS) $(CFCYG)\r
+LFLAGS = $(LFCYG) $(CFDEBUG) -fpic -s -mwindows -lwsock32 -lwinmm -lcomctl32\r
+\r
+\r
+all: $(PROJ).exe\r
+\r
+\r
+clean:\r
+       rm -f *~ $(PROJ).exe $(PROJ).err $(PROJ).rbj $(PROJ).RES $(PROJ).res\\r
+       *.sbr *.bsc *.o *.obj *.plg *.opt *.ncb *.debug *.bak *.gid *.GID\\r
+       *.map *.pdb *.tmp $(PROJ).ini\r
+\r
+\r
+# Update the help file if necessary\r
+$(PROJ).hlp : $(PROJ).rtf\r
+       $(HC) $(PROJ).hpj\r
+       @cat $(PROJ).err\r
+       @mv $(PROJ).hlp tmp.hlp\r
+       @mv tmp.hlp $(PROJ).hlp # these moves to get the case right\r
+\r
+\r
+# Update the resource if necessary\r
+wbres.o: $(PROJ).rc $(PROJ).h resource.h\r
+       windres --use-temp-file --include-dir .. $< -O coff -o $@\r
+\r
+\r
+# note: cygwin flex needs m4 package.  cygwin-setup forgets this dependency\r
+# note2: use mingw flex instead... although I got cygwin's flex working (with m4),\r
+#        it didn't produce a useable parser.c (1000's of errors)\r
+parser.c: ../parser.l\r
+       $(FLEX) -oparser.c -L ../parser.l\r
+\r
+\r
+$(PROJ).exe: $(OBJS) $(PROJ).hlp\r
+       $(CC) $(guiflags) $(OBJS) $(LFLAGS) -o $(PROJ).exe\r
+\r
+\r
+winboard.o: winboard.c config.h winboard.h ../common.h ../frontend.h ../backend.h \\r
+       ../moves.h wgamelist.h defaults.h resource.h wclipbrd.h \\r
+       wedittags.h wsockerr.h woptions.h wsnap.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+backend.o: ../backend.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../parser.h ../moves.h ../zippy.h ../backendz.h ../gettext.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+parser.o: parser.c config.h ../common.h ../backend.h ../parser.h \\r
+       ../frontend.h ../moves.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+moves.o: ../moves.c config.h ../backend.h ../common.h ../parser.h \\r
+       ../moves.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+lists.o: ../lists.c config.h ../lists.h ../common.h\r
+       $(call compile, $<)\r
+\r
+gamelist.o: ../gamelist.c config.h ../lists.h ../common.h ../frontend.h \\r
+       ../backend.h ../parser.h\r
+       $(call compile, $<)\r
+\r
+wclipbrd.obj: wclipbrd.c config.h ../common.h ../frontend.h ../backend.h \\r
+       winboard.h resource.h wclipbrd.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+wedittags.obj: wedittags.c config.h ../common.h winboard.h resource.h ../frontend.h \\r
+       ../backend.h ../lists.h wedittags.h\r
+       $(call compile, $<)\r
+\r
+wgamelist.obj: wgamelist.c config.h. ../common.h winboard.h resource.h ../frontend.h \\r
+       ../backend.h wgamelist.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+woptions.obj: woptions.c config.h ../common.h ../frontend.h ../backend.h ../lists.h \\r
+       defaults.h winboard.h resource.h\r
+       $(call compile, $<)\r
+\r
+wengineo.obj: wengineo.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h winboard.h resource.h wsnap.h\r
+       $(call compile, $<)\r
+\r
+whistory.obj: whistory.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h winboard.h resource.h wsnap.h\r
+       $(call compile, $<)\r
+\r
+wevalgraph.obj: wevalgraph.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h winboard.h resource.h wsnap.h\r
+       $(call compile, $<)\r
+\r
+wlayout.obj: wlayout.c config.h ../common.h winboard.h resource.h\r
+       $(call compile, $<)\r
+\r
+wsockerr.obj: wsockerr.c wsockerr.h\r
+       $(call compile, $<)\r
+\r
+wsnap.obj: wsnap.c wsnap.h\r
+       $(call compile, $<)\r
+\r
+pgntags.o: ../pgntags.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../parser.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+zippy.o: ../zippy.c config.h ../common.h ../zippy.h ../frontend.h \\r
+       ../backend.h ../backendz.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+book.o: ../book.c ../common.h ../backend.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+uci.o: ../uci.c ..//common.h ../backend.h ../frontend.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+%.o: %.c\r
+       $(call compile, $<)\r

diff --git a/winboard/makefile.ms b/winboard/makefile.ms
new file mode 100644 (file)
index 0000000..d406aef
--- /dev/null
+++ b/winboard/makefile.ms
@@ -0,0 +1,160 @@
+# Command line: nmake /f makefile.ms\r
+# Set VCVER=6 for MSVC 4.x through 7.0(aka 2002 aka .NET).\r
+# For MSVC 8 (aka 2005) set VCVER=8.  Beyond that try 8 first.\r
+VCVER=6\r
+\r
+\r
+PROJ = winboard\r
+\r
+\r
+OBJS=backend.obj book.obj gamelist.obj lists.obj moves.obj pgntags.obj uci.obj zippy.obj\\r
+ parser.obj wclipbrd.obj wedittags.obj wengineo.obj wevalgraph.obj wgamelist.obj\\r
+ whistory.obj winboard.obj wlayout.obj woptions.obj wsnap.obj wsockerr.obj\r
+\r
+\r
+# Debugging?\r
+USE_DEBUG=0\r
+\r
+\r
+CC = @cl\r
+RC = @rc\r
+LINK = link\r
+HC="c:\program files\help workshop\hcrtf.exe" -xn\r
+FLEX = "c:/mingw/mingw32/bin/flex.exe"\r
+DEFS = -D_WIN32_IE=0x300 -DWIN32 -DWINVER=0x400 -D_WIN32_WINDOWS=0x500\r
+#WARN = -W3\r
+ARCH =\r
+\r
+\r
+!if $(VCVER) >= 8\r
+CLIB= libcmt\r
+LIBF= -MT\r
+DEPRECATE=-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_USE_32BIT_TIME_T\r
+!else\r
+VSO = -Gf -Og\r
+CLIB = msvcrt\r
+LIBF = -MD\r
+!endif\r
+\r
+\r
+!if $(USE_DEBUG) == 0\r
+CFDEBUG = -DNDEBUG\r
+OPTS = -Os -Oy -Gs -GA -Zl $(VSO) $(LIBF)\r
+LFDEBUG = $(CLIB).lib\r
+!else\r
+CFDEBUG = -D_DEBUG -DDEBUG\r
+OPTS = -Od -Zi -Fd$(PROJ).pdb $(LIBF)d\r
+LFDEBUG = -DEBUG -PDB:$(PROJ).pdb -MAP:$(PROJ).map $(CLIB)d.lib\r
+!endif\r
+CF = $(CFDEBUG) $(DEFS) $(DEPRECATE) -I. -I..\r
+CFLAGS = -c -nologo $(WARN) $(CF) $(ARCH) $(OPTS)\r
+LFLAGS = -nologo $(LFDEBUG)\r
+\r
+\r
+all: $(PROJ).exe\r
+\r
+\r
+clean:\r
+        -erase *~ $(PROJ).exe $(PROJ).err $(PROJ).rbj $(PROJ).res *.sbr *.bsc\\r
+        *.o *.obj *.plg *.opt *.ncb *.debug *.bak *.gid *.map *.pdb *.ini\r
+\r
+\r
+# Update the help file if necessary\r
+$(PROJ).hlp : $(PROJ).rtf\r
+        $(HC) $(PROJ).hpj\r
+        -@type $(PROJ).err\r
+        -@rename $(PROJ).hlp $(PROJ).hlp.tmp\r
+        -@rename $(PROJ).hlp.tmp $(PROJ).hlp\r
+\r
+\r
+# Update the resource if necessary\r
+$(PROJ).res: $(PROJ).rc $(PROJ).h resource.h\r
+    $(RC) $(CF) -r -fo $(PROJ).res $(PROJ).rc\r
+\r
+parser.c: ../parser.l\r
+    $(FLEX) -oparser.c -L ../parser.l\r
+\r
+winboard.obj: winboard.c config.h winboard.h ../common.h ../frontend.h \\r
+        ../backend.h ../moves.h wgamelist.h defaults.h resource.h wclipbrd.h \\r
+        wedittags.h wsockerr.h woptions.h wsnap.h ../lists.h\r
+        $(CC) $(CFLAGS) winboard.c\r
+\r
+backend.obj: ../backend.c config.h ../common.h ../frontend.h ../backend.h \\r
+        ../parser.h ../moves.h ../zippy.h ../backendz.h ../gettext.h ../lists.h\r
+        $(CC) $(CFLAGS) ../backend.c\r
+\r
+parser.obj: parser.c config.h ../common.h ../backend.h ../parser.h \\r
+        ../frontend.h ../moves.h ../lists.h\r
+        $(CC) $(CFLAGS) parser.c\r
+\r
+book.obj: ../book.c ../common.h ../backend.h ../lists.h\r
+        $(CC) $(CFLAGS) ../book.c\r
+\r
+gamelist.obj: ../gamelist.c config.h ../lists.h ../common.h ../frontend.h \\r
+        ../backend.h ../parser.h\r
+        $(CC) $(CFLAGS) ../gamelist.c\r
+\r
+lists.obj: ../lists.c config.h ../lists.h ../common.h\r
+        $(CC) $(CFLAGS) ../lists.c\r
+\r
+moves.obj: ../moves.c config.h ../backend.h ../common.h ../parser.h \\r
+        ../moves.h ../lists.h\r
+        $(CC) $(CFLAGS) ../moves.c\r
+\r
+wclipbrd.obj: wclipbrd.c config.h ../common.h ../frontend.h ../backend.h \\r
+        winboard.h resource.h wclipbrd.h ../lists.h\r
+        $(CC) $(CFLAGS) wclipbrd.c\r
+\r
+wedittags.obj: wedittags.c config.h ../common.h winboard.h resource.h ../frontend.h \\r
+        ../backend.h ../lists.h wedittags.h\r
+        $(CC) $(CFLAGS) wedittags.c\r
+\r
+wgamelist.obj: wgamelist.c config.h. ../common.h winboard.h resource.h ../frontend.h \\r
+        ../backend.h wgamelist.h ../lists.h\r
+        $(CC) $(CFLAGS) wgamelist.c\r
+\r
+woptions.obj: woptions.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h defaults.h winboard.h resource.h\r
+        $(CC) $(CFLAGS) woptions.c\r
+\r
+wengineo.obj: wengineo.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h winboard.h resource.h wsnap.h\r
+        $(CC) $(CFLAGS) wengineo.c\r
+\r
+whistory.obj: whistory.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h winboard.h resource.h wsnap.h\r
+        $(CC) $(CFLAGS) whistory.c\r
+\r
+wevalgraph.obj: wevalgraph.c config.h ../common.h ../frontend.h ../backend.h \\r
+       ../lists.h winboard.h resource.h wsnap.h\r
+        $(CC) $(CFLAGS) wevalgraph.c\r
+\r
+wlayout.obj: wlayout.c config.h ../common.h winboard.h resource.h\r
+        $(CC) $(CFLAGS) wlayout.c\r
+\r
+wsockerr.obj: wsockerr.c wsockerr.h\r
+        $(CC) $(CFLAGS) wsockerr.c\r
+\r
+wsnap.obj: wsnap.c wsnap.h\r
+        $(CC) $(CFLAGS) wsnap.c\r
+\r
+pgntags.obj: ../pgntags.c config.h ../common.h ../frontend.h ../backend.h \\r
+        ../parser.h ../lists.h\r
+        $(CC) $(CFLAGS) ../pgntags.c\r
+\r
+zippy.obj: ../zippy.c config.h ../common.h ../zippy.h ../frontend.h \\r
+       ../backend.h ../backendz.h ../lists.h\r
+        $(CC) $(CFLAGS) ../zippy.c\r
+\r
+uci.obj: ../uci.c ..//common.h ../backend.h ../frontend.h ../lists.h\r
+        $(CC) $(CFLAGS) ../uci.c\r
+\r
+\r
+$(PROJ).exe: $(OBJS) $(PROJ).res $(PROJ).hlp\r
+    $(LINK) $(LFLAGS) $(OBJS) wsock32.lib comctl32.lib winmm.lib shell32.lib\\r
+ oldnames.lib kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib\\r
+ $(PROJ).res -out:$(PROJ).exe\r
+\r
+\r
+.c.obj:\r
+        $(CC) $(CFLAGS) $< 
\ No newline at end of file

diff --git a/winboard/res/winboard.exe.manifest b/winboard/res/winboard.exe.manifest
new file mode 100644 (file)
index 0000000..349abd5
--- /dev/null
+++ b/winboard/res/winboard.exe.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\r
+<assemblyIdentity\r
+    version="1.0.0.0"\r
+    processorArchitecture="X86"\r
+    name="Winboard.Application"\r
+    type="win32"\r
+/>\r
+<description>Winboard 32-bit application.</description>\r
+<dependency>\r
+    <dependentAssembly>\r
+        <assemblyIdentity\r
+            type="win32"\r
+            name="Microsoft.Windows.Common-Controls"\r
+            version="6.0.0.0"\r
+            processorArchitecture="X86"\r
+            publicKeyToken="6595b64144ccf1df"\r
+            language="*"\r
+        />\r
+    </dependentAssembly>\r
+</dependency>\r
+</assembly>\r

diff --git a/winboard/resource.h b/winboard/resource.h
index aa5dc8b..812247a 100644 (file)
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -2,6 +2,7 @@
 // Microsoft Developer Studio generated include file.\r
 // Used by winboard.rc\r
 //\r
 // Microsoft Developer Studio generated include file.\r
 // Used by winboard.rc\r
 //\r

+#define MANIFEST_RESOURCE_ID              1\r

 #define IDM_NewGame                     100\r
 #define IDM_LoadGame                    101\r
 #define IDM_SaveGame                    102\r
 #define IDM_NewGame                     100\r
 #define IDM_LoadGame                    101\r
 #define IDM_SaveGame                    102\r

diff --git a/winboard/wevalgraph.c b/winboard/wevalgraph.c
index fca6a67..55c3ec2 100644 (file)
--- a/winboard/wevalgraph.c
+++ b/winboard/wevalgraph.c
@@ -145,16 +145,11 @@ static VOID DrawAxisSegmentHoriz( int value, BOOL drawValue )
 \r
     if( drawValue ) {\r
         SIZE stSize;\r
 \r
     if( drawValue ) {\r
         SIZE stSize;\r

-        char buf[8];\r
+        char buf[MSG_SIZ], *b = buf;\r

         int cbBuf;\r
 \r
         int cbBuf;\r
 \r

-        if( value > 0 ) {\r
-            buf[0] = '+';\r
-            itoa( value, buf+1, 10 );\r
-        }\r
-        else {\r
-            itoa( value, buf, 10 );\r
-        }\r
+        if( value > 0 ) *b++ = '+';\r
+       sprintf(b, "%d", value);\r

 \r
         cbBuf = strlen( buf );\r
 \r
 \r
         cbBuf = strlen( buf );\r
 \r

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 55802b4..a00473e 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -57,6 +57,7 @@
 #include <windows.h>\r
 #include <winuser.h>\r
 #include <winsock.h>\r
 #include <windows.h>\r
 #include <winuser.h>\r
 #include <winsock.h>\r

+#include <commctrl.h>\r

 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r


@@ -1671,6 +1672,8 @@ ParseArgs(GetFunc get, void *cl)
     case ArgNone:\r
       ExitArgError("Unrecognized argument", argValue);\r
       break;\r
     case ArgNone:\r
       ExitArgError("Unrecognized argument", argValue);\r
       break;\r

+    case ArgTrue:\r
+    case ArgFalse: ;\r

     }\r
   }\r
 }\r
     }\r
   }\r
 }\r


@@ -1844,6 +1847,7 @@ InitAppData(LPSTR lpCmdLine)
   appData.reuseSecond = TRUE;\r
   appData.blindfold = FALSE;\r
   appData.icsEngineAnalyze = FALSE;\r
   appData.reuseSecond = TRUE;\r
   appData.blindfold = FALSE;\r
   appData.icsEngineAnalyze = FALSE;\r

+  memset(&dcb, 0, sizeof(DCB)); // required by VS 2002 +\r

   dcb.DCBlength = sizeof(DCB);\r
   dcb.BaudRate = 9600;\r
   dcb.fBinary = TRUE;\r
   dcb.DCBlength = sizeof(DCB);\r
   dcb.BaudRate = 9600;\r
   dcb.fBinary = TRUE;\r


@@ -8864,7 +8868,7 @@ DisplayMessage(char *str1, char *str2)
   }\r
   messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;\r
 \r
   }\r
   messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;\r
 \r

-  if (IsIconic(hwndMain)) return;\r
+  if (hwndMain == NULL || IsIconic(hwndMain)) return;\r

   hdc = GetDC(hwndMain);\r
   oldFont = SelectObject(hdc, font[boardSize][MESSAGE_FONT]->hf);\r
   ExtTextOut(hdc, messageRect.left, messageRect.top, ETO_CLIPPED|ETO_OPAQUE,\r
   hdc = GetDC(hwndMain);\r
   oldFont = SelectObject(hdc, font[boardSize][MESSAGE_FONT]->hf);\r
   ExtTextOut(hdc, messageRect.left, messageRect.top, ETO_CLIPPED|ETO_OPAQUE,\r


@@ -10697,3 +10701,4 @@ void SetProgramStats( FrontEndProgramStats * stats )
 \r
     EngineOutputUpdate( stats );\r
 }\r
 \r
     EngineOutputUpdate( stats );\r
 }\r

+///
\ No newline at end of file

diff --git a/winboard/winboard.dsp b/winboard/winboard.dsp
index 0c28bf9..2b5ff01 100644 (file)
--- a/winboard/winboard.dsp
+++ b/winboard/winboard.dsp
@@ -1,10 +1,10 @@
 # Microsoft Developer Studio Project File - Name="winboard" - Package Owner=<4>\r
 # Microsoft Developer Studio Project File - Name="winboard" - Package Owner=<4>\r

-# Microsoft Developer Studio Generated Build File, Format Version 5.00\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r

 # ** DO NOT EDIT **\r
 \r
 # ** DO NOT EDIT **\r
 \r

-# TARGTYPE "Win32 (x86) External Target" 0x0106\r
+# TARGTYPE "Win32 (x86) Application" 0x0101\r

 \r
 \r

-CFG=winboard - Win32 Release\r
+CFG=winboard - Win32 Debug\r

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r


@@ -13,55 +13,73 @@ CFG=winboard - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r

-!MESSAGE NMAKE /f "winboard.mak" CFG="winboard - Win32 Release"\r
+!MESSAGE NMAKE /f "winboard.mak" CFG="winboard - Win32 Debug"\r

 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r

-!MESSAGE "winboard - Win32 Release" (based on "Win32 (x86) External Target")\r
-!MESSAGE "winboard - Win32 Debug" (based on "Win32 (x86) External Target")\r
+!MESSAGE "winboard - Win32 Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "winboard - Win32 Debug" (based on "Win32 (x86) Application")\r

 !MESSAGE \r
 \r
 # Begin Project\r
 !MESSAGE \r
 \r
 # Begin Project\r

+# PROP AllowPerConfigDependencies 0\r

 # PROP Scc_ProjName ""\r
 # PROP Scc_LocalPath ""\r
 # PROP Scc_ProjName ""\r
 # PROP Scc_LocalPath ""\r

+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r

 \r
 !IF  "$(CFG)" == "winboard - Win32 Release"\r
 \r
 \r
 !IF  "$(CFG)" == "winboard - Win32 Release"\r
 \r

+# PROP BASE Use_MFC 0\r

 # PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Use_Debug_Libraries 0\r

-# PROP BASE Output_Dir ".\Release"\r
-# PROP BASE Intermediate_Dir ".\Release"\r
-# PROP BASE Cmd_Line "NMAKE /f winboard.mak"\r
-# PROP BASE Rebuild_Opt "/a"\r
-# PROP BASE Target_File "winboard.exe"\r
-# PROP BASE Bsc_Name "winboard.bsc"\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r

 # PROP BASE Target_Dir ""\r
 # PROP BASE Target_Dir ""\r

+# PROP Use_MFC 0\r

 # PROP Use_Debug_Libraries 0\r
 # PROP Use_Debug_Libraries 0\r

-# PROP Output_Dir ".\Release"\r
-# PROP Intermediate_Dir ".\Release"\r
-# PROP Cmd_Line "nmake /f msvc.mak"\r
-# PROP Rebuild_Opt "/a"\r
-# PROP Target_File "winboard.exe"\r
-# PROP Bsc_Name "winboard.bsc"\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r

 # PROP Target_Dir ""\r
 # PROP Target_Dir ""\r

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /Og /Os /Oy /Gf /I "." /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D _WIN32_IE=0x300 /D WINVER=0x400 /D _WIN32_WINDOWS=0x500 /YX /Zl /FD /Gs /GA /c\r
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /i ".." /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\r
+# ADD LINK32 wsock32.lib comctl32.lib winmm.lib shell32.lib oldnames.lib kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib msvcrt.lib /nologo /subsystem:windows /pdb:none /machine:I386\r

 \r
 !ELSEIF  "$(CFG)" == "winboard - Win32 Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "winboard - Win32 Debug"\r
 \r

+# PROP BASE Use_MFC 0\r

 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Use_Debug_Libraries 1\r

-# PROP BASE Output_Dir ".\Debug"\r
-# PROP BASE Intermediate_Dir ".\Debug"\r
-# PROP BASE Cmd_Line "NMAKE /f winboard.mak"\r
-# PROP BASE Rebuild_Opt "/a"\r
-# PROP BASE Target_File "winboard.exe"\r
-# PROP BASE Bsc_Name "winboard.bsc"\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r

 # PROP BASE Target_Dir ""\r
 # PROP BASE Target_Dir ""\r

+# PROP Use_MFC 0\r

 # PROP Use_Debug_Libraries 1\r
 # PROP Use_Debug_Libraries 1\r

-# PROP Output_Dir ".\Debug"\r
-# PROP Intermediate_Dir ".\Debug"\r
-# PROP Cmd_Line "nmake /f msvc.mak"\r
-# PROP Rebuild_Opt "/a"\r
-# PROP Target_File "winboard.exe"\r
-# PROP Bsc_Name "winboard.bsc"\r
+# PROP Output_Dir "Debug"\r
+# PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r

 # PROP Target_Dir ""\r
 # PROP Target_Dir ""\r

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D _WIN32_IE=0x300 /D WINVER=0x400 /D _WIN32_WINDOWS=0x500 /YX /FD /GZ /c\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /i ".." /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 wsock32.lib comctl32.lib winmm.lib shell32.lib oldnames.lib kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib msvcrtd.lib /nologo /subsystem:windows /map /debug /machine:I386 /pdbtype:sept\r

 \r
 !ENDIF \r
 \r
 \r
 !ENDIF \r
 \r


@@ -69,35 +87,28 @@ CFG=winboard - Win32 Release
 \r
 # Name "winboard - Win32 Release"\r
 # Name "winboard - Win32 Debug"\r
 \r
 # Name "winboard - Win32 Release"\r
 # Name "winboard - Win32 Debug"\r

-\r
-!IF  "$(CFG)" == "winboard - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "winboard - Win32 Debug"\r
-\r
-!ENDIF \r
-\r

 # Begin Group "Source Files"\r
 \r
 # Begin Group "Source Files"\r
 \r

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r

 # Begin Source File\r
 \r
 # Begin Source File\r
 \r

-SOURCE=.\backend.c\r
+SOURCE=..\backend.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\common.c\r
+SOURCE=..\book.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\gamelist.c\r
+SOURCE=..\gamelist.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\lists.c\r
+SOURCE=..\lists.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\moves.c\r
+SOURCE=..\moves.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -105,424 +116,85 @@ SOURCE=.\parser.c
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\parser.l\r
+SOURCE=..\pgntags.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\pgntags.c\r
+SOURCE=..\uci.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wedittags.c\r
+SOURCE=.\wclipbrd.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wgamelist.c\r
+SOURCE=.\wedittags.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\winboard.c\r
+SOURCE=.\wengineo.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wsockerr.c\r
+SOURCE=.\wevalgraph.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\zippy.c\r
+SOURCE=.\wgamelist.c\r

 # End Source File\r
 # End Source File\r

-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"\r

 # Begin Source File\r
 \r
 # Begin Source File\r
 \r

-SOURCE=.\backend.h\r
+SOURCE=.\whistory.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\backendz.h\r
+SOURCE=.\winboard.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\common.h\r
-# End Source File\r
-# Begin Source File\r
+SOURCE=.\winboard.rc\r

 \r
 \r

-SOURCE=.\config.h\r
-# End Source File\r
-# Begin Source File\r
+!IF  "$(CFG)" == "winboard - Win32 Release"\r

 \r
 \r

-SOURCE=.\defaults.h\r
-# End Source File\r
-# Begin Source File\r
+# ADD BASE RSC /l 0x409\r
+# ADD RSC /l 0x409\r

 \r
 \r

-SOURCE=.\frontend.h\r
-# End Source File\r
-# Begin Source File\r
+!ELSEIF  "$(CFG)" == "winboard - Win32 Debug"\r

 \r
 \r

-SOURCE=.\lists.h\r
-# End Source File\r
-# Begin Source File\r
+# ADD BASE RSC /l 0x409\r
+# ADD RSC /l 0x409\r

 \r
 \r

-SOURCE=.\moves.h\r
-# End Source File\r
-# Begin Source File\r
+!ENDIF \r

 \r
 \r

-SOURCE=.\parser.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\resource.h\r
+SOURCE=.\wlayout.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wedittags.h\r
+SOURCE=.\woptions.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wgamelist.h\r
+SOURCE=.\wsnap.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\winboard.h\r
+SOURCE=.\wsockerr.c\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wsockerr.h\r
+SOURCE=..\zippy.c\r

 # End Source File\r
 # End Source File\r

-# Begin Source File\r
+# End Group\r
+# Begin Group "Header Files"\r

 \r
 \r

-SOURCE=.\zippy.h\r
-# End Source File\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r

 # End Group\r
 # Begin Group "Resource Files"\r
 \r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B21o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B21s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B40o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B40s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B64s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B80o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\B80s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\bepbeep.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\board.ico\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\ching.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\click.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\cymbal.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\Ding1.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\doodloop.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\drip.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\galactic.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\gong.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\honkhonk.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\icon_b.ico\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\icon_ob.ico\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\icon_ow.ico\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\icon_whi.ico\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\K21o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\K21s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\laser.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\move.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\N21o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\N21s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\P21o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\P21s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\penalty.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\phone.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\pop.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\pop2.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\Q21o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\Q21s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\R21o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\R21s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\R80o.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\R80s.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\slap.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\squeak.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\swish.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\thud.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\tim.bmp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\whipcrak.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\winboard.rc\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\WINBOARD.rtf\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmaps\zap.wav\r
-# End Source File\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r

 # End Group\r
 # End Group\r

-# Begin Source File\r
-\r
-SOURCE=.\sounds\alarm.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\challenge.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\channel.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\channel1.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\ching.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\click.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\cymbal.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\ding1.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\draw.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\drip.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\gong.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\honkhonk.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\kibitz.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\laser.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\lose.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\move.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\penalty.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\phone.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\pop.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\pop2.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\request.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\seek.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\shout.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\slap.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\squeak.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\sshout.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\swish.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\tell.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\thud.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\unfinished.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\whipcrak.wav\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sounds\win.wav\r
-# End Source File\r

 # End Target\r
 # End Project\r
 # End Target\r
 # End Project\r

diff --git a/winboard/winboard.dsw b/winboard/winboard.dsw
index 3945304..e0bf89c 100644 (file)
--- a/winboard/winboard.dsw
+++ b/winboard/winboard.dsw
@@ -1,9 +1,9 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00\r
+Microsoft Developer Studio Workspace File, Format Version 6.00\r

 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
 \r
 ###############################################################################\r
 \r
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
 \r
 ###############################################################################\r
 \r

-Project: "winboard"=.\winboard.dsp - Package Owner=<4>\r
+Project: "winboard"=".\winboard.dsp" - Package Owner=<4>\r

 \r
 Package=<5>\r
 {{{\r
 \r
 Package=<5>\r
 {{{\r

diff --git a/winboard/winboard.h b/winboard/winboard.h
index c24d020..19f539e 100644 (file)
--- a/winboard/winboard.h
+++ b/winboard/winboard.h
@@ -166,6 +166,15 @@ extern MyFont *font[NUM_SIZES][NUM_FONTS];
 #define OUTLINE_PIECE         1
 #define WHITE_PIECE           2
 
 #define OUTLINE_PIECE         1
 #define WHITE_PIECE           2
 

+/* Some definitions required by MSVC 4.1 */ 
+#ifndef WM_MOUSEWHEEL 
+#define WM_MOUSEWHEEL 0x020A 
+#endif 
+#ifndef SCF_DEFAULT 
+#define SCF_DEFAULT 0x0000 
+#define SCF_ALL 0x0004 
+#endif 
+

 #define COPY_TMP "wbcopy.tmp"
 #define PASTE_TMP "wbpaste.tmp"
 
 #define COPY_TMP "wbcopy.tmp"
 #define PASTE_TMP "wbpaste.tmp"
 

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 0759e9f..588c9a4 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -25,6 +25,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)\r
 #endif //_WIN32\r
 \r
 #pragma code_page(1252)\r
 #endif //_WIN32\r
 \r

+// moved to "res" subdir to make testing easier-- don't want it in the root\r
+MANIFEST_RESOURCE_ID    24      MOVEABLE PURE   "res\\winboard.exe.manifest"\r
+\r

 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Dialog\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Dialog\r

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 003878a..d685200 100644 (file)
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -2000,7 +2000,7 @@ SoundOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       tmp.data = NULL;
       MyLoadSound(&tmp);
       MyPlaySound(&tmp);
       tmp.data = NULL;
       MyLoadSound(&tmp);
       MyPlaySound(&tmp);

-      if (tmp.data  != NULL) free(tmp.data);
+      if (tmp.data  != NULL) FreeResource(tmp.data); // technically obsolete fn, but tmp.data is NOT malloc'd mem

       if (tmp.name != NULL) free(tmp.name);
       return TRUE;
 
       if (tmp.name != NULL) free(tmp.name);
       return TRUE;