Merge pull request #363 from rqou/master

Miscellaneous build tweaks
This commit is contained in:
Clifford Wolf 2017-07-18 15:21:12 +02:00 committed by GitHub
commit dbb2f755c1
2 changed files with 6 additions and 1 deletions

View File

@ -19,6 +19,7 @@ ENABLE_LIBYOSYS := 0
ENABLE_GPROF := 0 ENABLE_GPROF := 0
ENABLE_NDEBUG := 0 ENABLE_NDEBUG := 0
LINK_CURSES := 0 LINK_CURSES := 0
LINK_TERMCAP := 0
# clang sanitizers # clang sanitizers
SANITIZER = SANITIZER =
@ -213,6 +214,10 @@ ifeq ($(LINK_CURSES),1)
LDLIBS += -lcurses LDLIBS += -lcurses
ABCMKARGS += "ABC_READLINE_LIBRARIES=-lcurses -lreadline" ABCMKARGS += "ABC_READLINE_LIBRARIES=-lcurses -lreadline"
endif endif
ifeq ($(LINK_TERMCAP),1)
LDLIBS += -ltermcap
ABCMKARGS += "ABC_READLINE_LIBRARIES=-lreadline -ltermcap"
endif
ifeq ($(CONFIG),mxe) ifeq ($(CONFIG),mxe)
LDLIBS += -ltermcap LDLIBS += -ltermcap
endif endif

View File

@ -147,7 +147,7 @@ struct hash_ptr_ops {
return a == b; return a == b;
} }
static inline unsigned int hash(const void *a) { static inline unsigned int hash(const void *a) {
return (unsigned long)a; return (intptr_t)a;
} }
}; };