more patchlevel consolidation

win/Qt/qt_main.cpp

@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#include "patchlevel.h"
 #undef Invisible
 #undef Warning
 #undef index

win/curses/cursinit.c

@@ -7,7 +7,6 @@
 #include "hack.h"
 #include "wincurs.h"
 #include "cursinit.h"
-/*#include "patchlevel.h"*/
 
 #include <ctype.h>
 

win/curses/cursmain.c

@@ -5,11 +5,6 @@
 
 #include "curses.h"
 #include "hack.h"
-#ifdef SHORT_FILENAMES
-#include "patchlev.h"
-#else
-#include "patchlevel.h"
-#endif
 #include "color.h"
 #include "wincurs.h"
 

win/win32/mhmain.c

@@ -9,7 +9,9 @@
 #else
 #include "config.h"
 #endif
+#if !defined(PATCHLEVEL_H)
 #include "patchlevel.h"
+#endif
 #include "resource.h"
 #include "mhmsg.h"
 #include "mhinput.h"

win/win32/mhmap.c

@@ -13,7 +13,9 @@
 #include "resource.h"
 
 #include "color.h"
+#if !defined(PATCHLEVEL_H)
 #include "patchlevel.h"
+#endif
 
 #define NHMAP_FONT_NAME TEXT("Terminal")
 #define NHMAP_TTFONT_NAME TEXT("Consolas")

win/win32/mhsplash.c

@@ -13,7 +13,9 @@
 #else
 #include "config.h"
 #endif
+#if !defined(VERSION_MAJOR)
 #include "patchlevel.h"
+#endif
 #include "dlb.h"
 
 #define LLEN 128