From 291c690f002dd5d90ef94230965da2b333a543aa Mon Sep 17 00:00:00 2001
From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Thu, 28 Dec 2006 21:39:22 +0000
Subject: [PATCH] Add NO_HTMLHELP and turn it on by default in Makefile.cyg.

git-svn-id: svn://svn.tartarus.org/sgt/puzzles@7033 cda61777-01e9-0310-a592-d414129be87e
---
 mkfiles.pl |  2 +-
 windows.c  | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index 4aa7f20..cefd365 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -487,7 +487,7 @@ if (defined $makefiles{'cygwin'}) {
     "# RCINC = --include-dir c:\\cygwin\\include\\\n".
     "\n".
     &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
-      " -D_NO_OLDNAMES -DNO_MULTIMON " .
+      " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs)) .
 	       "\n".
     "LDFLAGS = -mno-cygwin -s\n".
diff --git a/windows.c b/windows.c
index d282d72..0185f01 100644
--- a/windows.c
+++ b/windows.c
@@ -4,7 +4,9 @@
 
 #include <windows.h>
 #include <commctrl.h>
+#ifndef NO_HTMLHELP
 #include <htmlhelp.h>
+#endif /* NO_HTMLHELP */
 
 #include <stdio.h>
 #include <assert.h>
@@ -36,12 +38,16 @@
 
 #define HELP_FILE_NAME  "puzzles.hlp"
 #define HELP_CNT_NAME   "puzzles.cnt"
+#ifndef NO_HTMLHELP
 #define CHM_FILE_NAME   "puzzles.chm"
+#endif /* NO_HTMLHELP */
 
+#ifndef NO_HTMLHELP
 typedef HWND (CALLBACK *htmlhelp_t)(HWND, LPCSTR, UINT, DWORD);
 static DWORD html_help_cookie;
 static htmlhelp_t htmlhelp;
 static HINSTANCE hh_dll;
+#endif /* NO_HTMLHELP */
 enum { NONE, HLP, CHM } help_type;
 char *help_path;
 const char *help_topic;
@@ -1009,6 +1015,7 @@ static void init_help(void)
     q = strrchr(b, ':');
     if (q && q >= r) r = q+1;
 
+#ifndef NO_HTMLHELP
     /*
      * Try HTML Help first.
      */
@@ -1033,6 +1040,7 @@ static void init_help(void)
 	    return;
 	}
     }
+#endif /* NO_HTMLHELP */
 
     /*
      * Now try old-style .HLP.
@@ -1086,6 +1094,7 @@ static void start_help(frontend *fe, const char *topic)
 	fe->help_running = TRUE;
 	break;
       case CHM:
+#ifndef NO_HTMLHELP
 	assert(help_path);
 	assert(htmlhelp);
 	if (topic) {
@@ -1097,6 +1106,7 @@ static void start_help(frontend *fe, const char *topic)
 	htmlhelp(fe->hwnd, str, HH_DISPLAY_TOPIC, 0);
 	fe->help_running = TRUE;
 	break;
+#endif /* NO_HTMLHELP */
       case NONE:
 	assert(!"This shouldn't happen");
 	break;
@@ -1116,9 +1126,11 @@ static void stop_help(frontend *fe)
 	    WinHelp(fe->hwnd, help_path, HELP_QUIT, 0);
 	    break;
 	  case CHM:
+#ifndef NO_HTMLHELP
 	    assert(htmlhelp);
 	    htmlhelp(NULL, NULL, HH_CLOSE_ALL, 0);
 	    break;
+#endif /* NO_HTMLHELP */
 	  case NONE:
 	    assert(!"This shouldn't happen");
 	    break;
@@ -1132,10 +1144,12 @@ static void stop_help(frontend *fe)
  */
 static void cleanup_help(void)
 {
+#ifndef NO_HTMLHELP
     if (help_type == CHM) {
 	assert(htmlhelp);
 	htmlhelp(NULL, NULL, HH_UNINITIALIZE, html_help_cookie);
     }
+#endif /* NO_HTMLHELP */
 }
 
 static void check_window_size(frontend *fe, int *px, int *py)
-- 
2.11.0