Final makefile adjustments and compiling instructions.

diff --git a/README b/README
index 2a78c7b..41c83fb 100644 (file)
--- a/README
+++ b/README
@@ -29,17 +29,14 @@ You can build WinBoard using the free Cygwin toolchain from
 www.cygnus.com with the following commands.\r
 \r
        cd winboard\r
-       make -f cygwin.mak\r
+       make -f makefile.gcc\r
 \r
 You can build WinBoard using Microsoft Visual C with the following\r
 commands, or by opening the project in Visual Studio and clicking the\r
 build button.\r
 \r
        cd winboard\r
-       nmake -f msvc.mak\r
-\r
-There is also a contributed .mak file for Borland C.  It's not\r
-maintained and thus may need updating if you want to use it.\r
+       nmake -f makefile.ms\r
 \r
 \r
 Reporting problems\r

diff --git a/winboard/COMPILING b/winboard/COMPILING
new file mode 100644 (file)
index 0000000..1ab1906
--- /dev/null
+++ b/winboard/COMPILING
@@ -0,0 +1,46 @@
+Compiling with an Integrated Development Envrionment\r
+\r
+    Microsoft Visual C++\r
+    --\r
+    For MSVC 6.0 IDE, all you need to do is 'File|Open Workspace...' and select\r
+    'winboard.dsw'.  Then to build, choose 'Build|Batch Build...' and select\r
+    the targets you want to build.  This method has full support for Debug and\r
+    Release builds either with or without JAWS support.\r
+\r
+    For later versions of Visual C++, open the same workspace and convert when\r
+    prompted.  Then compile as above.\r
+\r
+\r
+    DevCpp\r
+    --\r
+    For DevCpp, you need to 'File|Open Project or File...' and select either\r
+    'winboard.dev' or 'WB4Jaws.dev'.  After parsing the project, you can 'Execute|\r
+    Compile' to build.  This IDE has no facility for defines in the resource\r
+    compiler, so the version information resource will not indicate JAWS support\r
+    even if it actually has that support.  These projects are not set up for\r
+    debugging, but you can do so by adjusting the 'Compiler' and 'Parameters'\r
+    options in the 'Project|Project Options' dialog.\r
+\r
+\r
+\r
+Compiling from the Command Line\r
+\r
+    GCC -- this includes cygwin, mingw, djgpp and others.\r
+\r
+        make -f makefile.gcc\r
+\r
+        You can modify certain settings in the makefile such as JAWS support,\r
+        debugging support.  If using cygwin, you can select whether or not to\r
+        link with cygwin1.dll instead of the msvcrt runtime.\r
+\r
+\r
+    CL -- this includes MSVC and recent Intel compilers.\r
+\r
+        nmake -f makefile.ms        Note: NMAKE, not MAKE\r
+\r
+        For Visual Studio 2005 and later, set VCVER to 8, otherwise set it to 6.\r
+        You can select JAWS support or debugging just like the GCC makefile.  For\r
+        MSVC 6.0 and earlier, you are going to need the latest SDK from Microsoft.\r
+        After you install it, set the SDK_INC variable appropriately.  It defaults\r
+        to the standard location, but you still need to uncomment the line.\r
+\r

diff --git a/winboard/Winboard.dev b/winboard/Winboard.dev
index ac36507..39b89f3 100644 (file)
--- a/winboard/Winboard.dev
+++ b/winboard/Winboard.dev
@@ -10,13 +10,13 @@ Libs=
 PrivateResource=Winboard_private.rc\r
 ResourceIncludes=..\r
 MakeIncludes=\r
-Compiler=-I.._@@_-I._@@_\r
+Compiler=-I.._@@_-I._@@_-DNDEBUG_@@_\r
 CppCompiler=\r
 Linker=-fpic_@@_-s_@@_-mwindows_@@_-lwsock32_@@_-lwinmm_@@_-lcomctl32_@@_\r
 IsCpp=0\r
 Icon=\r
 ExeOutput=\r
-ObjectOutput=\r
+ObjectOutput=./objs\r
 OverrideOutput=0\r
 OverrideOutputName=Winboard.exe\r
 HostApplication=\r
@@ -24,7 +24,7 @@ Folders=
 CommandLine=\r
 UseCustomMakefile=0\r
 CustomMakefile=makefile.gcc\r
-IncludeVersionInfo=1\r
+IncludeVersionInfo=0\r
 SupportXPThemes=0\r
 CompilerSet=0\r
 CompilerSettings=0000000000001000000100\r
@@ -228,24 +228,6 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[VersionInfo]\r
-Major=4\r
-Minor=4\r
-Release=0\r
-Build=11\r
-LanguageID=1033\r
-CharsetID=1252\r
-CompanyName=\r
-FileVersion=4.4.0k\r
-FileDescription=Developed using the Dev-C++ IDE\r
-InternalName=winboard.exe\r
-LegalCopyright=GPLv3\r
-LegalTrademarks=\r
-OriginalFilename=winboard.exe\r
-ProductName=Winboard\r
-ProductVersion=4.4.0k\r
-AutoIncBuildNr=0\r
-\r
 [Unit21]\r
 FileName=..\zippy.c\r
 CompileCpp=0\r

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 7e7b820..2e78c0b 100644 (file)
--- a/winboard/makefile.gcc
+++ b/winboard/makefile.gcc
@@ -70,7 +70,6 @@ $(PROJ).hlp : $(PROJ).rtf
 \r
 \r
 # Update the resource if necessary\r
-#wbres.o: $(RESDEPS)\r
 wbres.o: $(PROJ).rc $(PROJ).h resource.h\r
        windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@\r
 \r

diff --git a/winboard/makefile.ms b/winboard/makefile.ms
index c6b886c..2e0b953 100644 (file)
--- a/winboard/makefile.ms
+++ b/winboard/makefile.ms
@@ -3,13 +3,19 @@
 # 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\r
 \r
 \r
 # Debugging?\r
@@ -54,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
@@ -167,4 +176,4 @@ $(PROJ).exe: $(OBJS) $(PROJ).res $(PROJ).hlp
 \r
 \r
 .c.obj:\r
-        $(CC) $(CFLAGS) $< 
\ No newline at end of file
+        $(CC) $(CFLAGS) $< \r