|
 |
ce6537b |
--- sys/unix/Makefile.src.orig 2019-05-13 10:45:22.525054741 -0500
|
|
|
ce6537b |
+++ sys/unix/Makefile.src 2019-05-13 15:54:05.290209398 -0500
|
|
|
ce6537b |
@@ -66,7 +66,7 @@
|
|
|
2e10103 |
# if you get setcgtty() warnings during execution, you are feeding gcc
|
|
|
2e10103 |
# a non-ANSI <sys/ioctl.h> -- either run fixincludes on it or use
|
|
|
2e10103 |
# -traditional in CFLAGS
|
|
|
2e10103 |
-# CC = gcc
|
|
|
2e10103 |
+CC = gcc
|
|
|
2e10103 |
#
|
|
|
2e10103 |
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
|
|
|
2e10103 |
#
|
|
|
dfdfba6 |
@@ -130,7 +130,8 @@
|
|
|
2e10103 |
# flags for Linux
|
|
|
2e10103 |
# compile normally
|
|
|
2e10103 |
# CFLAGS = -O2 -fomit-frame-pointer -I../include
|
|
|
2e10103 |
-# LFLAGS = -L/usr/X11R6/lib
|
|
|
2e10103 |
+LFLAGS = -L/usr/X11R6/lib
|
|
|
dfdfba6 |
+CFLAGS = -D__clang_minor__ -O2 -fomit-frame-pointer -I../include ${RPM_OPT_FLAGS}
|
|
|
2e10103 |
# OR compile backwards compatible a.out format
|
|
|
2e10103 |
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
|
|
|
2e10103 |
# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
|
|
|
ce6537b |
@@ -267,12 +267,12 @@
|
|
|
ce6537b |
#WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o tile.o
|
|
|
2e10103 |
#
|
|
|
2e10103 |
#
|
|
|
2e10103 |
-#WINSRC = $(WINTTYSRC)
|
|
|
2e10103 |
-#WINOBJ = $(WINTTYOBJ)
|
|
|
ce6537b |
+#WINSRC = $(WINTTYSRC) $(WINX11SRC)
|
|
|
ce6537b |
+#WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
|
|
|
ce6537b |
#
|
|
|
ce6537b |
# Curses - Karl Garrison, Tangles
|
|
|
ce6537b |
-#WINSRC = $(WINCURSESSRC)
|
|
|
ce6537b |
-#WINOBJ = $(WINCURSESOBJ)
|
|
|
ce6537b |
+WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINCURSESSRC)
|
|
|
ce6537b |
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINCURSESOBJ)
|
|
|
ce6537b |
#
|
|
|
2e10103 |
# on some systems the termcap library is in -ltermcap or -lcurses
|
|
|
2e10103 |
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
|
|
|
ce6537b |
@@ -287,12 +287,12 @@
|
|
|
2e10103 |
# WINTTYLIB = -ltermcap
|
|
|
2e10103 |
# WINTTYLIB = -lcurses
|
|
|
2e10103 |
# WINTTYLIB = -lcurses16
|
|
|
2e10103 |
-# WINTTYLIB = -lncurses
|
|
|
2e10103 |
+WINTTYLIB = -lncurses
|
|
|
2e10103 |
#WINTTYLIB = -ltermlib
|
|
|
2e10103 |
#
|
|
|
2e10103 |
# libraries for X11
|
|
|
2e10103 |
# If USE_XPM is defined in config.h, you will also need -lXpm here.
|
|
|
ce6537b |
-#WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
|
|
|
2e10103 |
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11
|
|
|
2e10103 |
# WINX11LIB = -lXaw -lXmu -lXt -lX11
|
|
|
2e10103 |
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
|
|
|
2e10103 |
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
|
|
|
ce6537b |
@@ -327,7 +327,7 @@
|
|
|
ce6537b |
# same as above, for XCurses
|
|
|
ce6537b |
#WINCURSESLIB = -L/usr/local/lib/pdcurses -lXCurses -lXawM -lXmu -lXext -lXt -lX11
|
|
|
ce6537b |
#
|
|
|
2e10103 |
-#WINLIB = $(WINTTYLIB)
|
|
|
ce6537b |
+WINLIB = $(WINTTYLIB) $(WINX11LIB)
|
|
|
ce6537b |
#
|
|
|
ce6537b |
# For Curses
|
|
|
ce6537b |
#WINLIB = $(WINCURSESLIB)
|
|
|
ce6537b |
--- sys/unix/Makefile.utl.orig 2019-05-13 11:05:33.255674384 -0500
|
|
|
ce6537b |
+++ sys/unix/Makefile.utl 2019-05-13 11:07:09.572212625 -0500
|
|
|
ce6537b |
@@ -20,7 +20,7 @@
|
|
|
2e10103 |
|
|
|
2e10103 |
# if you are using gcc as your compiler,
|
|
|
2e10103 |
# uncomment the CC definition below if it's not in your environment
|
|
|
2e10103 |
-# CC = gcc
|
|
|
2e10103 |
+CC = gcc
|
|
|
2e10103 |
#
|
|
|
2e10103 |
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
|
|
|
2e10103 |
#
|
|
|
dfdfba6 |
@@ -78,7 +78,8 @@
|
|
|
2e10103 |
# flags for Linux
|
|
|
2e10103 |
# compile normally
|
|
|
2e10103 |
# CFLAGS = -O2 -fomit-frame-pointer -I../include
|
|
|
2e10103 |
-# LFLAGS = -L/usr/X11R6/lib
|
|
|
2e10103 |
+LFLAGS = -L/usr/X11R6/lib
|
|
|
dfdfba6 |
+CFLAGS = -D__clang_minor__ -O2 -fomit-frame-pointer -I../include ${RPM_OPT_FLAGS}
|
|
|
2e10103 |
# OR compile backwards compatible a.out format
|
|
|
2e10103 |
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
|
|
|
2e10103 |
# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
|
|
|
ce6537b |
@@ -111,11 +111,11 @@
|
|
|
2e10103 |
|
|
|
2e10103 |
# yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
|
|
|
2e10103 |
# if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
|
|
|
2e10103 |
-YACC = yacc
|
|
|
2e10103 |
-LEX = lex
|
|
|
2e10103 |
-# YACC = bison -y
|
|
|
ce6537b |
+# YACC = yacc
|
|
|
ce6537b |
+# LEX = lex
|
|
|
2e10103 |
+YACC = bison -y
|
|
|
2e10103 |
# YACC = byacc
|
|
|
2e10103 |
-# LEX = flex
|
|
|
2e10103 |
+LEX = flex
|
|
|
2e10103 |
|
|
|
2e10103 |
# these are the names of the output files from YACC/LEX. Under MS-DOS
|
|
|
2e10103 |
# and similar systems, they may differ
|