remove added hints file
append the -fno-common to the existing Makefile
This commit is contained in:
+2
-1
@@ -12,9 +12,10 @@ matrix:
|
|||||||
- make install
|
- make install
|
||||||
- name: linux-nocommon-xenial-gcc
|
- name: linux-nocommon-xenial-gcc
|
||||||
os: linux
|
os: linux
|
||||||
env: HINTS=linux-travis LUA_VERSION=5.3.5
|
env: HINTS=linux LUA_VERSION=5.3.5
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
script:
|
script:
|
||||||
|
- echo "CFLAGS+=-fno-common" >>sys/unix/hints/linux
|
||||||
- cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
|
- cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
|
||||||
- make fetch-lua
|
- make fetch-lua
|
||||||
- test -d "lib/lua-$LUA_VERSION/src" || exit 0
|
- test -d "lib/lua-$LUA_VERSION/src" || exit 0
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
#
|
|
||||||
# NetHack 3.6 linux $NHDT-Date: 1432512814 2015/05/25 00:13:34 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
|
|
||||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
|
||||||
# NetHack may be freely redistributed. See license for details.
|
|
||||||
#
|
|
||||||
#-PRE
|
|
||||||
# Linux hints file
|
|
||||||
# This hints file provides a single-user tty build for Linux, specifically
|
|
||||||
# for Ubuntu dapper.
|
|
||||||
|
|
||||||
|
|
||||||
#PREFIX=/usr
|
|
||||||
PREFIX=$(wildcard ~)/nh/install
|
|
||||||
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
|
|
||||||
SHELLDIR = $(PREFIX)/games
|
|
||||||
INSTDIR=$(HACKDIR)
|
|
||||||
VARDIR = $(HACKDIR)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
POSTINSTALL=cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
|
|
||||||
|
|
||||||
CFLAGS=-g -O -I../include -DNOTPARMDECL -fno-common
|
|
||||||
CFLAGS+=-DDLB
|
|
||||||
CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
|
|
||||||
CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
|
|
||||||
CFLAGS+=-DTIMED_DELAY
|
|
||||||
CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
|
|
||||||
CFLAGS+=-DDUMPLOG
|
|
||||||
CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
|
|
||||||
CFLAGS+=-DCURSES_GRAPHICS
|
|
||||||
#CFLAGS+=-DEXTRA_SANITY_CHECKS
|
|
||||||
#CFLAGS+=-DEDIT_GETLIN
|
|
||||||
#CFLAGS+=-DSCORE_ON_BOTL
|
|
||||||
#CFLAGS+=-DMSGHANDLER
|
|
||||||
#CFLAGS+=-DTTY_TILES_ESCCODES
|
|
||||||
|
|
||||||
# when building liblua.a, avoid warning that use of tmpnam() should be
|
|
||||||
# replaced by mkstemp(); the lua code doesn't use nethack's config.h so
|
|
||||||
# this needs to be passed via make rather than defined in unixconf.h
|
|
||||||
SYSCFLAGS=-DLUA_USE_POSIX
|
|
||||||
|
|
||||||
LINK=$(CC)
|
|
||||||
# Only needed for GLIBC stack trace:
|
|
||||||
LFLAGS=-rdynamic
|
|
||||||
|
|
||||||
WINSRC = $(WINTTYSRC) $(WINCURSESSRC)
|
|
||||||
WINOBJ = $(WINTTYOBJ) $(WINCURSESOBJ)
|
|
||||||
WINLIB = $(WINTTYLIB) $(WINCURSESLIB)
|
|
||||||
|
|
||||||
# if TTY_TILES_ESCCODES
|
|
||||||
#WINSRC += tile.c
|
|
||||||
#WINOBJ += tile.o
|
|
||||||
|
|
||||||
WINTTYLIB=-lncurses -ltinfo
|
|
||||||
|
|
||||||
CHOWN=true
|
|
||||||
CHGRP=true
|
|
||||||
|
|
||||||
VARDIRPERM = 0755
|
|
||||||
VARFILEPERM = 0600
|
|
||||||
GAMEPERM = 0755
|
|
||||||
Reference in New Issue
Block a user