diff --git a/.travis.yml b/.travis.yml index a2373f078..46e74c339 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,15 @@ language: c matrix: include: - os: linux - env: HINTS=linux + env: DESCR=linux-xenial-gcc HINTS=linux compiler: gcc script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" - os: linux - env: HINTS=linux + env: DESCR=linux-xenial-gcc HINTS=linux compiler: clang script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" - os: linux - env: HINTS=linux-x11 + env: DESCR=linux-xenial-gcc-x11 HINTS=linux-x11 compiler: gcc addons: apt: @@ -20,7 +20,7 @@ matrix: - xfonts-utils script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" - os: linux - env: HINTS=linux-qt5 + env: DESCR=linux-xenial-gcc-qt5 HINTS=linux-qt5 compiler: gcc addons: apt: @@ -33,7 +33,18 @@ matrix: - qtbase5-dev-tools script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && QT_SELECT=5 make MOC=moc install" - 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 script: | cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ @@ -59,7 +70,7 @@ matrix: make install cat dat/options - os: windows - env: HINTS=windows-visual-studio + env: DESCR=windows-visualstudio language: shell script: # - find /c/Program\ Files\ \(x86\) -iname 'rc.exe' -print @@ -98,7 +109,7 @@ matrix: - nmake install - os: windows # install: choco install mingw - env: HINTS=windows-mingw + env: DESCR=windows-mingw script: - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses - export ADD_CURSES=Y @@ -118,5 +129,3 @@ notifications: email: recipients: - devteam@nethack.org - - diff --git a/sys/unix/hints/linux-qt5 b/sys/unix/hints/linux-qt5 index 8532cc207..9a561130f 100644 --- a/sys/unix/hints/linux-qt5 +++ b/sys/unix/hints/linux-qt5 @@ -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+= 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+=-DHACKDIR=\"$(HACKDIR)\" diff --git a/sys/unix/hints/linux-x11 b/sys/unix/hints/linux-x11 index d8e29aa85..3b1caf8d9 100644 --- a/sys/unix/hints/linux-x11 +++ b/sys/unix/hints/linux-x11 @@ -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+= 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+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\"