forked from github/server
weg mit stdbool.h, das macht nur ärger.
library-path für luabind
This commit is contained in:
parent
44faa4e2fd
commit
b30849b397
|
@ -1,3 +1,6 @@
|
||||||
|
C++ = g++ ;
|
||||||
|
CC = gcc ;
|
||||||
|
|
||||||
if ! $(DISTCC_HOSTS) {
|
if ! $(DISTCC_HOSTS) {
|
||||||
} else {
|
} else {
|
||||||
CC = distcc $(CC) ;
|
CC = distcc $(CC) ;
|
||||||
|
|
|
@ -98,7 +98,8 @@ a_findc(const attrib * a, const attrib_type * at)
|
||||||
}
|
}
|
||||||
|
|
||||||
attrib *
|
attrib *
|
||||||
a_add(attrib ** pa, attrib * a) {
|
a_add(attrib ** pa, attrib * a)
|
||||||
|
{
|
||||||
attrib ** find = pa;
|
attrib ** find = pa;
|
||||||
assert(a->next==NULL && a->nexttype==NULL);
|
assert(a->next==NULL && a->nexttype==NULL);
|
||||||
while (*find && (*find)->type!=a->type) find = &(*find)->next;
|
while (*find && (*find)->type!=a->type) find = &(*find)->next;
|
||||||
|
|
|
@ -45,13 +45,6 @@
|
||||||
# include <dmalloc.h>
|
# include <dmalloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
# include <stdbool.h>
|
|
||||||
# define HAS_BOOLEAN
|
|
||||||
typedef int boolean;
|
|
||||||
/* # define boolean bool */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_DEBUG) && defined(_MSC_VER)
|
#if defined(_DEBUG) && defined(_MSC_VER)
|
||||||
# ifndef MALLOCDBG
|
# ifndef MALLOCDBG
|
||||||
# define MALLOCDBG 1
|
# define MALLOCDBG 1
|
||||||
|
|
|
@ -27,7 +27,7 @@ if $(HAVE_LUA) {
|
||||||
server.cpp
|
server.cpp
|
||||||
;
|
;
|
||||||
|
|
||||||
LINKLIBS on $(BINARY) += -llua50 -llualib50 ;
|
LINKLIBS on $(BINARY) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
|
||||||
LINKLIBS on $(BINARY) += -lluabind ;
|
LINKLIBS on $(BINARY) += -lluabind ;
|
||||||
LINKLIBS on $(BINARY) += -ldl -lstdc++ ;
|
LINKLIBS on $(BINARY) += -ldl -lstdc++ ;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue