From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Wed, 26 Aug 2009 03:36:53 +0000 (-0700)
Subject: undid some previous changes
X-Git-Tag: v4.4.0.beta2~6
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=69e908b2b2fc7ed6e66aa3811418738a086f4fb2;p=xboard.git

undid some previous changes

some files got mixed up
---

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 8dc4a88..83dde19 100644
--- 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\
  parser.o wbres.o wclipbrd.o wedittags.o wengineo.o wevalgraph.o\
  wgamelist.o whistory.o winboard.o wlayout.o woptions.o wsnap.o\
- wsockerr.o help.o settings.o
+ wsockerr.o help.o wsettings.o
 
 
 # make compiling less spammy
@@ -18,6 +18,10 @@ compile = @echo "$1"; $(CC) $(CFLAGS) $1
 USE_DEBUG=0
 
 
+# JAWS support?
+JAWS=0
+
+
 # set this to 1 unless you don't mind linking with cygwin1.dll
 USE_MINGW=1
 
@@ -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"
 HC="C:/Program Files/Help Workshop/hcrtf" -xn
 DEFS = -D_WIN32_IE=0x0300 -DWIN32
-
+ifeq ($(JAWS),1)
+  DEFS += -DJAWS
+endif
 WARN = -Wall -Wno-char-subscripts -Wno-parentheses
 ARCH =
 ifeq ($(USE_DEBUG),0)
@@ -65,7 +71,7 @@ $(PROJ).hlp : $(PROJ).rtf
 
 # Update the resource if necessary
 wbres.o: $(PROJ).rc $(PROJ).h resource.h
-	windres --use-temp-file --include-dir .. $< -O coff -o $@
+	windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@
 
 
 # note: cygwin flex needs m4 package.  cygwin-setup forgets this dependency
diff --git a/winboard/makefile.ms b/winboard/makefile.ms
index 5c28200..c78bbb4 100644
--- 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.
 VCVER=6
 
+# If using MSVC 6.0 or earlier, you will need the latest platform SDK supported.
+# Set SDK_INC to the include directory after you install it.
+# See: http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
+#SDK_INC="C:\Program Files\Microsoft SDK\include"
+
 
 PROJ = winboard
 
 
-OBJS=backend.obj book.obj gamelist.obj lists.obj moves.obj pgntags.obj uci.obj zippy.obj\
- parser.obj wclipbrd.obj wedittags.obj wengineo.obj wevalgraph.obj wgamelist.obj\
- whistory.obj winboard.obj wlayout.obj woptions.obj wsnap.obj wsockerr.obj help.obj
+OBJS=backend.obj book.obj gamelist.obj lists.obj moves.obj pgntags.obj uci.obj\
+ zippy.obj parser.obj wclipbrd.obj wedittags.obj wengineo.obj wevalgraph.obj\
+ wgamelist.obj whistory.obj winboard.obj wlayout.obj woptions.obj wsnap.obj\
+ wsockerr.obj help.obj wsettings.obj
 
 
 # Debugging?
 USE_DEBUG=0
 
+
+# JAWS support?
+JAWS=0
+
+
 CC = @cl
 RC = @rc
 LINK = link
 HC="c:\program files\help workshop\hcrtf.exe" -xn
 FLEX = "c:/mingw/mingw32/bin/flex.exe"
-DEFS = -D_WIN32_IE=0x300 -DWIN32 -DWINVER=0x400 -D_WIN32_WINDOWS=0x500
+DEFS = -D_WIN32_IE=0x300 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINDOWS=0x500
+!if $(JAWS) == 1
+DEFS = -DJAWS $(DEFS)
+!endif
 #WARN = -W3
 ARCH =
 
@@ -46,6 +60,9 @@ OPTS = -Od -Zi -Fd$(PROJ).pdb $(LIBF)d
 LFDEBUG = -DEBUG -PDB:$(PROJ).pdb -MAP:$(PROJ).map $(CLIB)d.lib
 !endif
 CF = $(CFDEBUG) $(DEFS) $(DEPRECATE) -I. -I..
+!if DEFINED(SDK_INC)
+CF = $(CF) -I$(SDK_INC)
+!endif
 CFLAGS = -c -nologo $(WARN) $(CF) $(ARCH) $(OPTS)
 LFLAGS = -nologo $(LFDEBUG)
 
@@ -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
         $(CC) $(CFLAGS) ../uci.c
 
+
 wsettings.obj: wsettings.c ..//common.h ../backend.h ../frontend.h ../lists.h
         $(CC) $(CFLAGS) wsettings.c
 
diff --git a/winboard/resource.h b/winboard/resource.h
index 3a886d0..565fab6 100644
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -496,6 +496,8 @@
 #define IDC_SPECIFY_ENG_STATIC          1814
 #define IDC_SPECIFY_SERVER_STATIC       1815
 #define OPT_MESS                        1818
+#define IDM_Engine1Options		1890
+#define IDM_Engine2Options		1891
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 0218d98..4cb2174 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -1,6 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
+#include "config.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////