clang istead of gcc

diff --git a/doomgeneric/Makefile b/doomgeneric/Makefile
index a35d5fbf3c1b4e68db8813484b406aacfbbe11f0..ceecc5737d11db6432fbbc2703177bff0061abd0 100644 (file)
--- a/doomgeneric/Makefile
+++ b/doomgeneric/Makefile
@@ -12,7 +12,7 @@ else
 endif
 
 
-CC=gcc  # gcc or g++
+CC=clang  # gcc or g++
 CFLAGS+=-ggdb3 -Os
 LDFLAGS+=-Wl,--gc-sections
 CFLAGS+=-ggdb3 -Wall -DNORMALUNIX -DLINUX -DSNDSERV -D_DEFAULT_SOURCE # -DUSEASM

diff --git a/doomgeneric/Makefile.sdl b/doomgeneric/Makefile.sdl
index a694125b4ab1a8b73801c4852085d9dbc6b1086b..a2605a419fb25e2b8ed3719decc639cc925c3d5b 100644 (file)
--- a/doomgeneric/Makefile.sdl
+++ b/doomgeneric/Makefile.sdl
@@ -12,11 +12,11 @@ else
 endif
 
 
-SDL_CFLAGS = -D_THREAD_SAFE -I/usr/local/Cellar/sdl2/2.0.10/include/SDL2
-SDL_LIBS = -L/usr/local/Cellar/sdl2/2.0.10/lib -lSDL2
+SDL_CFLAGS = -D_THREAD_SAFE -I/usr/include/SDL2
+SDL_LIBS =
 
 
-CC=gcc  # gcc or g++
+CC=clang  # gcc or g++
 CFLAGS+=-ggdb3 -Os $(INCLUDES) $(SDL_CFLAGS)
 LDFLAGS+=-Wl,-dead_strip
 CFLAGS+=-ggdb3 -Wall -DNORMALUNIX -DLINUX -DSNDSERV # -DUSEASM

diff --git a/doomgeneric/doomgeneric_soso.c b/doomgeneric/doomgeneric_soso.c
index d5c3e87c43a67afc580093c55feaffbe822e0507..2be12cbe518bf1ca26eb86db3af0f1ace76f1b79 100644 (file)
--- a/doomgeneric/doomgeneric_soso.c
+++ b/doomgeneric/doomgeneric_soso.c
@@ -115,8 +115,7 @@ void enableRawMode()
   tcgetattr(STDIN_FILENO, &orig_termios);
   atexit(disableRawMode);
   struct termios raw = orig_termios;
-  raw.c_lflag &= ~(ECHO | ICANON);
-  //raw.c_lflag &= ~(ECHO);
+  raw.c_lflag &= ~(ECHO);
   raw.c_cc[VMIN] = 0;
   tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw);
 }