undid some previous changes

some files got mixed up

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 8dc4a88..83dde19 100644 (file)
--- a/winboard/makefile.gcc
+++ b/winboard/makefile.gcc
@@ -7,7 +7,7 @@ PROJ=winboard
 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 help.o settings.o\r
+ wsockerr.o help.o wsettings.o\r
 \r
 \r
 # make compiling less spammy\r
@@ -18,6 +18,10 @@ compile = @echo "$1"; $(CC) $(CFLAGS) $1
 USE_DEBUG=0\r
 \r
 \r
+# JAWS support?\r
+JAWS=0\r
+\r
+\r
 # set this to 1 unless you don't mind linking with cygwin1.dll\r
 USE_MINGW=1\r
 \r
@@ -33,7 +37,9 @@ FLEX = "flex.exe" # we need version 2.5.4 or later, cygwin's is 2.5.35
 #      "c:/mingw/mingw32/bin/flex.exe"\r
 HC="C:/Program Files/Help Workshop/hcrtf" -xn\r
 DEFS = -D_WIN32_IE=0x0300 -DWIN32\r
-\r
+ifeq ($(JAWS),1)\r
+  DEFS += -DJAWS\r
+endif\r
 WARN = -Wall -Wno-char-subscripts -Wno-parentheses\r
 ARCH =\r
 ifeq ($(USE_DEBUG),0)\r
@@ -65,7 +71,7 @@ $(PROJ).hlp : $(PROJ).rtf
 \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
+       windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@\r
 \r
 \r
 # note: cygwin flex needs m4 package.  cygwin-setup forgets this dependency\r

diff --git a/winboard/makefile.ms b/winboard/makefile.ms
index 5c28200..c78bbb4 100644 (file)
--- a/winboard/makefile.ms
+++ b/winboard/makefile.ms
@@ -3,24 +3,38 @@
 # For MSVC 8 (aka 2005) set VCVER=8.  Beyond that try 8 first.\r
 VCVER=6\r
 \r
+# If using MSVC 6.0 or earlier, you will need the latest platform SDK supported.\r
+# Set SDK_INC to the include directory after you install it.\r
+# See: http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm\r
+#SDK_INC="C:\Program Files\Microsoft SDK\include"\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 help.obj\r
+OBJS=backend.obj book.obj gamelist.obj lists.obj moves.obj pgntags.obj uci.obj\\r
+ zippy.obj parser.obj wclipbrd.obj wedittags.obj wengineo.obj wevalgraph.obj\\r
+ wgamelist.obj whistory.obj winboard.obj wlayout.obj woptions.obj wsnap.obj\\r
+ wsockerr.obj help.obj wsettings.obj\r
 \r
 \r
 # Debugging?\r
 USE_DEBUG=0\r
 \r
+\r
+# JAWS support?\r
+JAWS=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
+DEFS = -D_WIN32_IE=0x300 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINDOWS=0x500\r
+!if $(JAWS) == 1\r
+DEFS = -DJAWS $(DEFS)\r
+!endif\r
 #WARN = -W3\r
 ARCH =\r
 \r
@@ -46,6 +60,9 @@ OPTS = -Od -Zi -Fd$(PROJ).pdb $(LIBF)d
 LFDEBUG = -DEBUG -PDB:$(PROJ).pdb -MAP:$(PROJ).map $(CLIB)d.lib\r
 !endif\r
 CF = $(CFDEBUG) $(DEFS) $(DEPRECATE) -I. -I..\r
+!if DEFINED(SDK_INC)\r
+CF = $(CF) -I$(SDK_INC)\r
+!endif\r
 CFLAGS = -c -nologo $(WARN) $(CF) $(ARCH) $(OPTS)\r
 LFLAGS = -nologo $(LFDEBUG)\r
 \r
@@ -151,6 +168,7 @@ zippy.obj: ../zippy.c config.h ../common.h ../zippy.h ../frontend.h \
 uci.obj: ../uci.c ..//common.h ../backend.h ../frontend.h ../lists.h\r
         $(CC) $(CFLAGS) ../uci.c\r
 \r
+\r
 wsettings.obj: wsettings.c ..//common.h ../backend.h ../frontend.h ../lists.h\r
         $(CC) $(CFLAGS) wsettings.c\r
 \r

diff --git a/winboard/resource.h b/winboard/resource.h
index 3a886d0..565fab6 100644 (file)
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -496,6 +496,8 @@
 #define IDC_SPECIFY_ENG_STATIC          1814\r
 #define IDC_SPECIFY_SERVER_STATIC       1815\r
 #define OPT_MESS                        1818\r
+#define IDM_Engine1Options             1890\r
+#define IDM_Engine2Options             1891\r
 #define IDC_STATIC                      -1\r
 \r
 // Next default values for new objects\r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 0218d98..4cb2174 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -1,6 +1,7 @@
 //Microsoft Developer Studio generated resource script.\r
 //\r
 #include "resource.h"\r
+#include "config.h"\r
 \r
 #define APSTUDIO_READONLY_SYMBOLS\r
 /////////////////////////////////////////////////////////////////////////////\r