Remove NORMALUNIX define

Author: jserv

src/d_main.c

@@ -33,14 +33,12 @@ rcsid[] = "$Id: d_main.c,v 1.8 1997/02/03 22:45:09 b1 Exp $";
 #define FGCOLOR         8
 
 
-#ifdef NORMALUNIX
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#endif
 
 
 #include "doomdef.h"
@@ -580,7 +578,6 @@ void IdentifyVersion (void)
     char*       plutoniawad;
     char*       tntwad;
 
-#ifdef NORMALUNIX
     char *home;
     char *doomwaddir;
     doomwaddir = getenv("DOOMWADDIR");
@@ -627,7 +624,6 @@ void IdentifyVersion (void)
         sprintf(basedefault, "%s/.doomrc", home);
     else
         sprintf(basedefault, "doomrc");
-#endif
 
     if (M_CheckParm ("-shdev"))
     {

src/d_net.c

@@ -104,9 +104,7 @@ unsigned NetbufferChecksum (void)
     c = 0x1234567;
 
     // FIXME -endianess?
-#ifdef NORMALUNIX
     return 0;                   // byte order problems
-#endif
 
     l = (NetbufferSize () - (int)&(((doomdata_t *)0)->retransmitfrom))/4;
     for (i=0 ; i<l ; i++)

src/m_misc.c

@@ -235,7 +235,6 @@ default_t       defaults[] =
     {"show_messages",&showMessages, 1},
 
 
-#ifdef NORMALUNIX
     {"key_right",&key_right, KEY_RIGHTARROW},
     {"key_left",&key_left, KEY_LEFTARROW},
     {"key_up",&key_up, KEY_UPARROW},
@@ -252,8 +251,6 @@ default_t       defaults[] =
 #ifdef SNDSERV
     {"sndserver", (int *) &sndserver_filename, (int) "sndserver"},
     {"mb_used", &mb_used, 2},
-#endif
-
 #endif
 
     {"use_mouse",&usemouse, 1},

src/riscv/Makefile

@@ -3,14 +3,11 @@ CROSS ?= riscv-none-embed-
 CC = $(CROSS)gcc
 OBJCOPY = $(CROSS)objcopy
 SIZE = $(CROSS)size
-ICEPROG = iceprog
 
+# RISC-V specific options
 CFLAGS=-Wall -O2 -march=rv32im -mabi=ilp32 -ffreestanding -flto -fomit-frame-pointer -Wl,--gc-section --specs=nano.specs -I..
 
-CFLAGS += \
-	-DNORMALUNIX \
-	$(NULL)
-
+# resolution
 CFLAGS += -DSCREENWIDTH=640 -DSCREENHEIGHT=360
 
 include ../sources.mk
@@ -30,8 +27,7 @@ SOURCES_doom_arch := \
 	i_system.c \
 	i_video.c \
 	s_sound.c \
-	console.c  \
-	$(NULL)
+	console.c
 
 
 all: doom-riscv.elf
@@ -47,12 +43,5 @@ clean:
 %.bin: %.elf
 	$(OBJCOPY) -O binary $< $@
 
-prog: doom-riscv.bin
-	$(ICEPROG) -o 1M $<
-
-prog_wad: data/doomu.wad
-	$(ICEPROG) -o 2M $<
-
-
-.PHONY: all clean prog prog_wad
+.PHONY: all clean
 .PRECIOUS: *.elf

src/riscv/d_main.c

@@ -33,14 +33,12 @@ rcsid[] = "$Id: d_main.c,v 1.8 1997/02/03 22:45:09 b1 Exp $";
 #define FGCOLOR         8
 
 
-#ifdef NORMALUNIX
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#endif
 
 
 #include "doomdef.h"

src/w_wad.c

@@ -25,8 +25,6 @@
 static const char __attribute__((unused))
 rcsid[] = "$Id: w_wad.c,v 1.5 1997/02/03 16:47:57 b1 Exp $";
 
-
-#ifdef NORMALUNIX
 #include <ctype.h>
 #include <sys/types.h>
 #include <string.h>
@@ -36,7 +34,6 @@ rcsid[] = "$Id: w_wad.c,v 1.5 1997/02/03 16:47:57 b1 Exp $";
 #include <sys/stat.h>
 #include <alloca.h>
 #define O_BINARY                0
-#endif
 
 #include "doomdef.h"
 #include "doomtype.h"