diff --git a/.travis.yml b/.travis.yml index d56ffae16..4eab2f6ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,11 @@ matrix: sed -i 's/^#define TEXTCOLOR//' include/unixconf.h make fetch-lua && make install cat dat/options + - os: windows + env: DESCR=windows-visualstudio + language: shell + script: + - ./win/win32/vs2017/travisci.sh - os: linux env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5 compiler: gcc @@ -80,11 +85,6 @@ matrix: - sh sys/msdos/msdos-cross-compile.sh exclude: - os: windows - env: DESCR=windows-visualstudio - language: shell - script: - - ./win/win32/vs2017/travisci.sh - - os: windows # install: choco install mingw env: DESCR=windows-mingw script: diff --git a/Files b/Files index 32120db05..b7448e53c 100644 --- a/Files +++ b/Files @@ -70,10 +70,10 @@ fixes30.pl05 fixes30.pl06 fixes30.pl07 fixes30.pl08 fixes30.pl09 fixes30.pl10 fixes31.1 fixes31.2 fixes31.3 fixes32.0 fixes32.1 fixes32.2 fixes32.3 fixes33.0 fixes33.1 fixes34.0 fixes34.1 fixes34.2 fixes34.3 fixes35.0 -fixes36.0 fixes36.1 fixes36.2 fixes36.3 fixes37.0 -fixesXX.X makedefs.6 makedefs.txt mn.7 mnh.7 -nethack.6 nethack.txt recover.6 recover.txt tmac.n -tmac.nh window.doc +fixes36.0 fixes36.1 fixes36.2 fixes36.3 fixes36.4 +fixes37.0 fixesXX.X makedefs.6 makedefs.txt mn.7 +mnh.7 nethack.6 nethack.txt recover.6 recover.txt +tmac.n tmac.nh window.doc include: (files for GEM versions) diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross index a15a495ed..1cdc6d287 100644 --- a/sys/msdos/Makefile1.cross +++ b/sys/msdos/Makefile1.cross @@ -309,10 +309,10 @@ $(HOST_O)prereq.tag: $(INCL)/nhlua.h hobj.tag $(U)makedefs \ $(INCL)/nhlua.h: cd $(INCL); \ echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \ - echo '#include \"../lib/lua-5.3.5/src/lua.h\"' >> $@; \ + echo '#include "../lib/lua-5.3.5/src/lua.h"' >> $@; \ sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-5.3.5/src/lua.h >> $@; \ - echo '#include \"../lib/lua-5.3.5/src/lualib.h\"' >> $@; \ - echo '#include \"../lib/lua-5.3.5/src/lauxlib.h\"' >> $@; \ + echo '#include "../lib/lua-5.3.5/src/lualib.h"' >> $@; \ + echo '#include "../lib/lua-5.3.5/src/lauxlib.h"' >> $@; \ echo '/*nhlua.h*/' >> $@; \ cd $(SRC) diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c index 15acd2ef7..372895c70 100644 --- a/sys/unix/unixmain.c +++ b/sys/unix/unixmain.c @@ -498,12 +498,13 @@ boolean wr; #ifdef VAR_PLAYGROUND int len = strlen(VAR_PLAYGROUND); - fqn_prefix[SCOREPREFIX] = (char *) alloc(len + 2); - Strcpy(fqn_prefix[SCOREPREFIX], VAR_PLAYGROUND); - if (fqn_prefix[SCOREPREFIX][len - 1] != '/') { - fqn_prefix[SCOREPREFIX][len] = '/'; - fqn_prefix[SCOREPREFIX][len + 1] = '\0'; + g.fqn_prefix[SCOREPREFIX] = (char *) alloc(len + 2); + Strcpy(g.fqn_prefix[SCOREPREFIX], VAR_PLAYGROUND); + if (g.fqn_prefix[SCOREPREFIX][len - 1] != '/') { + g.fqn_prefix[SCOREPREFIX][len] = '/'; + g.fqn_prefix[SCOREPREFIX][len + 1] = '\0'; } + #endif } @@ -523,11 +524,11 @@ boolean wr; */ if (wr) { #ifdef VAR_PLAYGROUND - fqn_prefix[LEVELPREFIX] = fqn_prefix[SCOREPREFIX]; - fqn_prefix[SAVEPREFIX] = fqn_prefix[SCOREPREFIX]; - fqn_prefix[BONESPREFIX] = fqn_prefix[SCOREPREFIX]; - fqn_prefix[LOCKPREFIX] = fqn_prefix[SCOREPREFIX]; - fqn_prefix[TROUBLEPREFIX] = fqn_prefix[SCOREPREFIX]; + g.fqn_prefix[LEVELPREFIX] = g.fqn_prefix[SCOREPREFIX]; + g.fqn_prefix[SAVEPREFIX] = g.fqn_prefix[SCOREPREFIX]; + g.fqn_prefix[BONESPREFIX] = g.fqn_prefix[SCOREPREFIX]; + g.fqn_prefix[LOCKPREFIX] = g.fqn_prefix[SCOREPREFIX]; + g.fqn_prefix[TROUBLEPREFIX] = g.fqn_prefix[SCOREPREFIX]; #endif check_recordfile(dir); } diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 3bae6668d..614b32533 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -527,7 +527,12 @@ DATABASE = $(DAT)\data.base # ctags options # #CTAGSCMD=ctags-orig.exe +!IF "$(TRAVIS_BUILD_DIR)" != "" +CTAGSCMD=..\lib\ctags\ctags.exe +!ELSE CTAGSCMD=..\..\..\ctags\ctags.exe +!ENDIF + CTAGSOPT =--language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern # # ctags wants unix-style pathnames diff --git a/win/Qt4/qt4stat.cpp b/win/Qt4/qt4stat.cpp index be0ceb1cc..c8d250718 100644 --- a/win/Qt4/qt4stat.cpp +++ b/win/Qt4/qt4stat.cpp @@ -431,7 +431,7 @@ void NetHackQtStatusWindow::updateStats() if (u.mtimedone) { buf = nh_capitalize_words(mons[u.umonnum].mname); } else { - buf = rank_of(u.ulevel, pl_character[0], ::flags.female); + buf = rank_of(u.ulevel, g.pl_character[0], ::flags.female); } QString buf2; buf2.sprintf("%s the %s", g.plname, buf.toLatin1().constData()); @@ -441,7 +441,7 @@ void NetHackQtStatusWindow::updateStats() if (describe_level(buf3)) { dlevel.setLabel(buf3,true); } else { - buf.sprintf("%s, level ", dungeons[u.uz.dnum].dname); + buf.sprintf("%s, level ", g.dungeons[u.uz.dnum].dname); dlevel.setLabel(buf,(long)::depth(&u.uz)); } diff --git a/win/win32/vs2017/travisci.sh b/win/win32/vs2017/travisci.sh index 812f4cdd8..b3e7de13e 100644 --- a/win/win32/vs2017/travisci.sh +++ b/win/win32/vs2017/travisci.sh @@ -24,9 +24,17 @@ export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB -git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses +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 ctags +nmake -f mk_mvc.mak +cd ../../ export ADD_CURSES=Y -export PDCURSES_TOP=../../pdcurses +export PDCURSES_TOP=../lib/pdcurses export cd src cp ../sys/winnt/Makefile.msc ./Makefile