diff --git a/src/Jamrules b/src/Jamrules index 88dd7a0d7..684f8bbd2 100644 --- a/src/Jamrules +++ b/src/Jamrules @@ -1,3 +1,6 @@ +C++ = g++ ; +CC = gcc ; + if ! $(DISTCC_HOSTS) { } else { CC = distcc $(CC) ; diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c index a67400195..564fa2ca3 100644 --- a/src/common/util/attrib.c +++ b/src/common/util/attrib.c @@ -98,7 +98,8 @@ a_findc(const attrib * a, const attrib_type * at) } attrib * -a_add(attrib ** pa, attrib * a) { +a_add(attrib ** pa, attrib * a) +{ attrib ** find = pa; assert(a->next==NULL && a->nexttype==NULL); while (*find && (*find)->type!=a->type) find = &(*find)->next; diff --git a/src/config.h b/src/config.h index 6b6eb6f85..ed5fd5a25 100644 --- a/src/config.h +++ b/src/config.h @@ -45,13 +45,6 @@ # include #endif -#if defined(__GNUC__) -# include -# define HAS_BOOLEAN -typedef int boolean; -/* # define boolean bool */ -#endif - #if defined(_DEBUG) && defined(_MSC_VER) # ifndef MALLOCDBG # define MALLOCDBG 1 diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile index c94a77f3f..703312b54 100644 --- a/src/eressea/Jamfile +++ b/src/eressea/Jamfile @@ -27,7 +27,7 @@ if $(HAVE_LUA) { server.cpp ; - LINKLIBS on $(BINARY) += -llua50 -llualib50 ; + LINKLIBS on $(BINARY) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ; LINKLIBS on $(BINARY) += -lluabind ; LINKLIBS on $(BINARY) += -ldl -lstdc++ ; } else {