From bdb8edff11cb74fcb64f152d157d0ec0979d8a4f Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 21 Dec 2019 14:22:24 -0500
Subject: [PATCH] attempt to get all 3.7.0 builds working in travis
 successfully

multiple flavours of unix including bionic and xenial
multiple Windows builds including visual studio and mingw
msdos cross-compile on unix
---
 .travis.yml             | 26 ++++++++++++++++----------
 sys/winnt/Makefile.gcc  | 26 ++++++++++++--------------
 sys/winnt/travis-gcc.sh |  8 ++++++++
 3 files changed, 36 insertions(+), 24 deletions(-)
 create mode 100644 sys/winnt/travis-gcc.sh

diff --git a/.travis.yml b/.travis.yml
index cc707bb88..dba3f2649 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ matrix:
       env: DESCR=linux-xenial-gcc HINTS=linux
       compiler: gcc
       script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make fetch-lua && make install"
+    - os: linux
+      env: DESCR=linux-bionic-gcc HINTS=linux
+      dist: bionic
+      compiler: gcc
+      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make fetch-lua && make install"
     - os: linux
       env: DESCR=linux-xenial-clang HINTS=linux
       compiler: clang
@@ -74,6 +79,17 @@ matrix:
       language: shell
       script:
         - ./win/win32/vs2017/travisci.sh
+    - os: windows
+#     install: choco install mingw
+      env: DESCR=windows-mingw
+      script:
+        - sh sys/winnt/travis-gcc.sh
+        - export ADD_CURSES=Y
+        - export PDCURSES_TOP=../lib/pdcurses
+        - export LUA_VERSION=5.3.5
+        - cd src
+        - cp ../sys/winnt/Makefile.gcc ./Makefile
+        - mingw32-make install
     - os: linux
       env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5
       compiler: gcc
@@ -84,16 +100,6 @@ matrix:
         - cd lib/lua-$LUA_VERSION/src && make a && cd ../../.. 
         - sh sys/msdos/msdos-cross-compile.sh
   exclude:
-    - os: windows
-#     install: choco install mingw
-      env: DESCR=windows-mingw
-      script:
-        - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
-        - export ADD_CURSES=Y
-        - export PDCURSES_TOP=../../pdcurses
-        - cd src
-        - cp ../sys/winnt/Makefile.gcc ./Makefile
-        - mingw32-make install
 #    - os: osx
 #      osx_image: xcode10.3
 #      env: DESCR=osx-xcode10.3-x11 HINTS=macosx10.14 WANT_WIN_CURSES=1 WANT_WIN_X11=1 USE_XPM=1
diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index fbfd11000..92828aea3 100644
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -270,9 +270,7 @@ U  = $(UTIL)/
 # Utility Objects.
 #
 
-MAKESRC        = $(U)makedefs.c
-
-MAKEOBJS       = $(O)makedefs.o $(O)monst.o $(O)objects.o
+MAKEDEFSOBJS       = $(O)makedefs.o $(O)monst.o $(O)objects.o
 
 RECOVOBJS      = $(O)recover.o
 
@@ -304,8 +302,8 @@ VOBJ05 = $(O)do_wear.o  $(O)dog.o      $(O)dogmove.o  $(O)dokick.o
 VOBJ06 = $(O)dothrow.o  $(O)drawing.o  $(O)dungeon.o  $(O)eat.o     
 VOBJ07 = $(O)end.o      $(O)engrave.o  $(O)exper.o    $(O)explode.o 
 VOBJ08 = $(O)extralev.o $(O)files.o    $(O)fountain.o $(O)hack.o    
-VOBJ09 = $(O)hacklib.o  $(O)invent.o   $(O)light.o    $(O)lock.o    
-VOBJ10 = $(O)mail.o     $(O)makemon.o  $(O)mapglyph.o $(O)isaac64.o
+VOBJ09 = $(O)hacklib.o  $(O)invent.o   $(O)light.o    $(O)lock.o
+VOBJ10 = $(O)mail.o     $(O)makemon.o  $(O)mapglyph.o $(O)mdlib.o $(O)isaac64.o
 VOBJ11 = $(O)mcastu.o   $(O)mhitm.o    $(O)mhitu.o    $(O)minion.o
 VOBJ12 = $(O)mklev.o    $(O)mkmap.o    $(O)mkmaze.o   $(O)mkobj.o
 VOBJ13 = $(O)mkroom.o   $(O)mon.o      $(O)mondata.o  $(O)monmove.o
@@ -791,12 +789,12 @@ $(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
 	@echo utilities made.
 
 $(INCL)/nhlua.h:
-	echo '/* nhlua.h - generated by top Makefile */' > $@
-	@echo '#include "../lib/lua-$(LUA_VERSION)/src/lua.h"' >> $@
-	@echo 'LUA_API int (lua_error) (lua_State *L) NORETURN;' >>$@
-	@echo '#include "../lib/lua-$(LUA_VERSION)/src/lualib.h"' >> $@
-	@echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@
-	@echo '/*nhlua.h*/' >> $@
+	echo /* nhlua.h - generated by top Makefile */ > $@
+	@echo #include "../lib/lua-$(LUA_VERSION)/src/lua.h" >> $@
+	@echo LUA_API int (lua_error) (lua_State *L) NORETURN; >>$@
+	@echo #include "../lib/lua-$(LUA_VERSION)/src/lualib.h" >> $@
+	@echo #include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h" >> $@
+	@echo /*nhlua.h*/ >> $@
 
 tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe
 	@echo Optional tile development utilities are up to date.
@@ -894,12 +892,12 @@ objdir.tag:
 # Makedefs Stuff
 #==========================================
 
-$(U)makedefs.exe: $(MAKEOBJS)
-	$(link) $(LFLAGSU) -o$@ $(MAKEOBJS)
+$(U)makedefs.exe: $(MAKEDEFSOBJS)
+	$(link) $(LFLAGSU) -o$@ $(MAKEDEFSOBJS)
 
 $(O)makedefs.o: $(CONFIG_H) $(INCL)/monattk.h $(INCL)/monflag.h \
 	 $(INCL)/objclass.h $(INCL)/monsym.h \
-	 $(INCL)/patchlevel.h $(U)makedefs.c
+	 $(INCL)/patchlevel.h $(U)makedefs.c $(SRC)\mdlib.c
 	$(cc) $(CFLAGSU) -o$@ $(U)makedefs.c
 
 #
diff --git a/sys/winnt/travis-gcc.sh b/sys/winnt/travis-gcc.sh
new file mode 100644
index 000000000..562b1a142
--- /dev/null
+++ b/sys/winnt/travis-gcc.sh
@@ -0,0 +1,8 @@
+set -x
+mkdir -p lib
+cd lib
+git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
+git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
+curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz
+tar zxf lua-5.3.5.tar.gz
+cd ../