nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-08-16 23:48:43 -04:00
parent 7f46365fb1 490d7f6d54
commit 0359f8fa45
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+18 -9
View File
@@ -2,15 +2,15 @@ language: c
matrix: matrix:
include: include:
- os: linux - os: linux
env: HINTS=linux env: DESCR=linux-xenial-gcc HINTS=linux
compiler: gcc compiler: gcc
script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
- os: linux - os: linux
env: HINTS=linux env: DESCR=linux-xenial-clang HINTS=linux
compiler: clang compiler: clang
script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
- os: linux - os: linux
env: HINTS=linux-x11 env: DESCR=linux-xenial-gcc-x11 HINTS=linux-x11
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
@@ -20,7 +20,7 @@ matrix:
- xfonts-utils - xfonts-utils
script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
- os: linux - os: linux
env: HINTS=linux-qt5 env: DESCR=linux-xenial-gcc-qt5 HINTS=linux-qt5
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
@@ -33,7 +33,18 @@ matrix:
- qtbase5-dev-tools - qtbase5-dev-tools
script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && QT_SELECT=5 make MOC=moc install" script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && QT_SELECT=5 make MOC=moc install"
- os: linux - os: linux
env: HINTS=linux-minimal env: DESCR=linux-bionic-gcc-x11 HINTS=linux-x11
dist: bionic
compiler: gcc
addons:
apt:
packages:
- libx11-dev
- libxaw7-dev
- xfonts-utils
script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
- os: linux
env: DESCR=linux-xenial-gcc-minimal HINTS=linux-minimal
compiler: gcc compiler: gcc
script: | script: |
cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -59,7 +70,7 @@ matrix:
make install make install
cat dat/options cat dat/options
- os: windows - os: windows
env: HINTS=windows-visual-studio env: DESCR=windows-visualstudio
language: shell language: shell
script: script:
# - find /c/Program\ Files\ \(x86\) -iname 'rc.exe' -print # - find /c/Program\ Files\ \(x86\) -iname 'rc.exe' -print
@@ -98,7 +109,7 @@ matrix:
- nmake install - nmake install
- os: windows - os: windows
# install: choco install mingw # install: choco install mingw
env: HINTS=windows-mingw env: DESCR=windows-mingw
script: script:
- git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
- export ADD_CURSES=Y - export ADD_CURSES=Y
@@ -118,5 +129,3 @@ notifications:
email: email:
recipients: recipients:
- devteam@nethack.org - devteam@nethack.org
sys/unix/hints/linux-qt5
+1 -1
View File
@@ -18,7 +18,7 @@ VARDIR = $(HACKDIR)
POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf; POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir); POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir -x .lev);
CFLAGS=-g -O -I../include -DNOTPARMDECL CFLAGS=-g -O -I../include -DNOTPARMDECL
CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
sys/unix/hints/linux-x11
+1 -1
View File
@@ -18,7 +18,7 @@ VARDIR = $(HACKDIR)
POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf; POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir); POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir -x .lev);
CFLAGS=-g -O -I../include -DNOTPARMDECL CFLAGS=-g -O -I../include -DNOTPARMDECL
CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\"