From 15f26fadf4315e0336fd0e2c68e7162c29bbffcb Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 5 Sep 2008 00:33:18 +0000
Subject: Fix #include statements to use lower case filenames. Add automake
 configuration for building heretic/hexen code.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1198
---
 src/hexen/m_misc.c   |  9 +--------
 src/hexen/mn_menu.c  |  2 --
 src/hexen/st_start.c | 13 +++++--------
 src/hexen/w_wad.c    | 16 +++++-----------
 4 files changed, 11 insertions(+), 29 deletions(-)

(limited to 'src/hexen')

diff --git a/src/hexen/m_misc.c b/src/hexen/m_misc.c
index ae7485ef..9903e200 100644
--- a/src/hexen/m_misc.c
+++ b/src/hexen/m_misc.c
@@ -29,11 +29,8 @@
 #else
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <direct.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <io.h>
-#include <conio.h>
 #endif
 #include <ctype.h>
 #include "h2def.h"
@@ -567,12 +564,8 @@ default_t defaults[] = {
 
     {"usegamma", &usegamma, 0},
 
-#ifdef __NeXT__
 #define DEFAULT_SAVEPATH		"hexndata/"
-#endif
-#ifdef __WATCOMC__
-#define DEFAULT_SAVEPATH		"hexndata\\"
-#endif
+
     {"savedir", (int *) &SavePath, (int) DEFAULT_SAVEPATH},
 
     {"messageson", (int *) &messageson, 1},
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index 8f11f8f6..36fcfacc 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -295,7 +295,6 @@ static Menu_t *Menus[] = {
     &SaveMenu
 };
 
-#ifdef __WATCOMC__
 static char *GammaText[] = {
     TXT_GAMMA_LEVEL_OFF,
     TXT_GAMMA_LEVEL_1,
@@ -303,7 +302,6 @@ static char *GammaText[] = {
     TXT_GAMMA_LEVEL_3,
     TXT_GAMMA_LEVEL_4
 };
-#endif
 
 // CODE --------------------------------------------------------------------
 
diff --git a/src/hexen/st_start.c b/src/hexen/st_start.c
index 4dc642b7..54ab9006 100644
--- a/src/hexen/st_start.c
+++ b/src/hexen/st_start.c
@@ -24,18 +24,15 @@
 
 
 // HEADER FILES ------------------------------------------------------------
-#ifdef __WATCOMC__
-#include <sys\stat.h>
-#include <sys\types.h>
-#include <io.h>
-#else
-#include <libc.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <stdarg.h>
+
+#ifndef O_BINARY
 #define O_BINARY 0
 #endif
+
 #include "h2def.h"
-#include <fcntl.h>
-#include <stdarg.h>             // Needed for next as well as dos
 #include "st_start.h"
 
 
diff --git a/src/hexen/w_wad.c b/src/hexen/w_wad.c
index 7ad7bb2f..9155d9cf 100644
--- a/src/hexen/w_wad.c
+++ b/src/hexen/w_wad.c
@@ -24,23 +24,17 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#ifdef NeXT
-#include <libc.h>
-#include <ctype.h>
-#else
-#include <malloc.h>
-#include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#endif
+
 #include "h2def.h"
 
 // MACROS ------------------------------------------------------------------
 
-#ifdef NeXT
-// NeXT doesn't need a binary flag in open call
+#ifndef O_BINARY
 #define O_BINARY 0
-#define strcmpi strcasecmp
 #endif
 
 // TYPES -------------------------------------------------------------------
-- 
cgit v1.2.3