rework windows nmake file

Keep object files separate between gui and tty builds as they
are not the same binary on windows.

The stubs.c file will no longer be necessary.

include/global.h

@@ -254,7 +254,7 @@ typedef uchar nhsym;
 #endif
 
 #if defined(X11_GRAPHICS) || defined(QT_GRAPHICS) || defined(GNOME_GRAPHICS) \
-    || defined(WIN32)
+    || defined(MSWIN_GRAPHICS)
 #ifndef NO_TILE_C
 #ifndef USE_TILES
 #define USE_TILES /* glyphmap[] with prefilled tile mappings will be available */

include/optlist.h

@@ -561,7 +561,7 @@ static int optfn_##a(int, int, boolean, char *, char *);
 #endif
     NHOPTC(statuslines, Status, 20, opt_in, set_in_game,
                 No, Yes, No, No, NoAlias, "2 or 3 lines for status display")
-#ifdef WIN32
+#ifdef WIN32CON
     NHOPTC(subkeyvalue, Advanced, 7, opt_in, set_in_config,
                 No, Yes, Yes, No, NoAlias, "override keystroke value")
 #endif

include/windconf.h

@@ -29,7 +29,7 @@
 #define DUMPLOG_MSG_COUNT 50
 
 #define USER_SOUNDS
-#define TTY_SOUND_ESCCODES
+/* #define TTY_SOUND_ESCCODES */
 
 /*#define CHANGE_COLOR*/ /* allow palette changes */