forked from github/server
parent
dfa59022bc
commit
de1658f961
|
@ -1,19 +0,0 @@
|
|||
TARGETS = subdirs
|
||||
|
||||
SUBDIRS = \
|
||||
util \
|
||||
kernel \
|
||||
gamecode \
|
||||
triggers \
|
||||
items \
|
||||
attributes \
|
||||
races \
|
||||
spells \
|
||||
modules \
|
||||
eressea \
|
||||
mapper
|
||||
|
||||
include ../Makefile.include
|
||||
|
||||
|
||||
## more definitions
|
|
@ -1,27 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-attributes.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../util -I../kernel -I../gamecode -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-gamecode.a
|
||||
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES = -I../kernel -I.. -I../util
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -70,11 +70,12 @@
|
|||
#include <attributes/synonym.h>
|
||||
|
||||
/* util includes */
|
||||
#include <event.h>
|
||||
#include <base36.h>
|
||||
#include <goodies.h>
|
||||
#include <rand.h>
|
||||
#include <sql.h>
|
||||
#include <util/base36.h>
|
||||
#include <util/event.h>
|
||||
#include <util/goodies.h>
|
||||
#include <util/log.h>
|
||||
#include <util/rand.h>
|
||||
#include <util/sql.h>
|
||||
#include <util/message.h>
|
||||
|
||||
#include <modules/xecmd.h>
|
||||
|
@ -3719,6 +3720,9 @@ use_cmd(unit * u, struct order * ord)
|
|||
if (itype!=NULL) {
|
||||
int i = use_item(u, itype, n, ord);
|
||||
assert(i<=0 || !"use_item should not return positive values.");
|
||||
if (i<=0) {
|
||||
log_error(("use_item returned a value>0 for %s\n", resourcename(itype->rtype, 0)));
|
||||
}
|
||||
} else {
|
||||
cmistake(u, ord, 43, MSG_PRODUCE);
|
||||
}
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-items.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../kernel -I../util -I../gamecode -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-kernel.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../util -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -1277,8 +1277,7 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
|
|||
/* effect of borders */
|
||||
while (b!=NULL) {
|
||||
if (b->type->move) {
|
||||
region * rto = b->type->move(b, u, current, next, false);
|
||||
assert(rto==NULL); /* should return NULL when not routing */
|
||||
b->type->move(b, u, current, next, false);
|
||||
}
|
||||
b = b->next;
|
||||
}
|
||||
|
|
|
@ -56,11 +56,6 @@ read_ID(FILE *f)
|
|||
return id;
|
||||
}
|
||||
|
||||
/****** Not implemented ******/
|
||||
obj_ID default_ID;
|
||||
/* die müssen schon ein value zurückliefern... */
|
||||
static char * notimplemented_desc(void *p) { unused(p); assert(0); return 0; }
|
||||
|
||||
/****** Unit ******/
|
||||
static obj_ID unit_ID(void *p) {
|
||||
obj_ID id; id.a = p ? ((unit *)p)->no : 0; id.b = 0; return id;
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-modules.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = alliance.c arena.c dungeon.c gmcmd.c infocmd.c museum.c score.c victoryconditions.c xecmd.c xmas.c
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../gamecode -I../kernel -I../util -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
|
@ -1,27 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-races.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../kernel -I../gamecode -I../util -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-spells.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../kernel -I../gamecode -I../util -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-triggers.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += -I../util -I../kernel -I../gamecode -I..
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(BUILD_DIR) $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
# executable:
|
||||
#$(BUILD_DIR)/$(BINARY):: $(OBJECTS)
|
||||
# $(LD) $(LDFLAGS) -o $@ $(OBJECTS)
|
||||
# $(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY = libe-util.a
|
||||
BINARY =
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
include $(ERESSEA_SRC)/Makefile.include
|
||||
|
||||
## more definitions
|
||||
|
||||
# library:
|
||||
$(BUILD_DIR)/$(LIBRARY):: $(OBJECTS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECTS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(LIBRARY): $(BUILD_DIR)/$(LIBRARY)
|
||||
$(INSTALL) $< $@
|
|
@ -1,55 +0,0 @@
|
|||
SUBDIRS =
|
||||
LIBNAME =
|
||||
EXENAME = eressea
|
||||
|
||||
include ../Makefile.include
|
||||
|
||||
##
|
||||
## cheating: we link all attributes/items/etc for all the games. TODO - don't.
|
||||
##
|
||||
#SOURCES = $(wildcard *.c)
|
||||
SOURCES = main.c korrektur.c
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
##
|
||||
## conversion code for old triggers - should only be used for free eressea,
|
||||
## and only for old datafiles.
|
||||
##
|
||||
ifeq ($(CONVERT_TRIGGERS), 1)
|
||||
SUBDIRS += old
|
||||
LIBRARIES += $(PUBLISH_DIR)/libe-compat.a
|
||||
LIBS += -le-compat
|
||||
endif
|
||||
|
||||
##
|
||||
## more definitions
|
||||
##
|
||||
|
||||
INCLUDES += \
|
||||
-I../common/gamecode \
|
||||
-I../common/kernel \
|
||||
-I../common/util \
|
||||
-I../common
|
||||
|
||||
LIBNAMES = \
|
||||
e-triggers \
|
||||
e-gamecode \
|
||||
e-modules \
|
||||
e-kernel \
|
||||
e-items \
|
||||
e-spells \
|
||||
e-races \
|
||||
e-attributes \
|
||||
e-util
|
||||
|
||||
LIBRARIES += $(LIBNAMES:%=$(PUBLISH_DIR)/lib%.a)
|
||||
|
||||
LIBS += $(LIBNAMES:%=-l%) -lm
|
||||
|
||||
# executable:
|
||||
|
||||
$(BUILD_DIR)/$(BINARY):: subdirs-$(CONFIG) $(BUILD_DIR) $(OBJECTS)
|
||||
$(LD) -o $@ $(OBJECTS) $(LDFLAGS)
|
||||
|
||||
$(PUBLISH_DIR)/$(BINARY): $(BUILD_DIR)/$(BINARY)
|
||||
$(INSTALL) $< $@
|
|
@ -1,60 +0,0 @@
|
|||
SUBDIRS =
|
||||
|
||||
LIBRARY =
|
||||
BINARY = mapper
|
||||
|
||||
include ../Makefile.include
|
||||
|
||||
SOURCES = $(wildcard *.c)
|
||||
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
|
||||
|
||||
## more definitions
|
||||
|
||||
INCLUDES += \
|
||||
-I../common/util \
|
||||
-I../common/kernel \
|
||||
-I../common/spells \
|
||||
-I../common \
|
||||
-I..
|
||||
|
||||
LIBNAMES = \
|
||||
e-kernel \
|
||||
e-gamecode \
|
||||
e-triggers \
|
||||
e-modules \
|
||||
e-attributes \
|
||||
e-items \
|
||||
e-spells \
|
||||
e-races \
|
||||
e-util
|
||||
|
||||
LIBS += \
|
||||
-L$(PUBLISH_DIR) \
|
||||
-lm
|
||||
|
||||
LIBDEPS = $(LIBNAMES:%=../$(BUILD_DIR)/lib%.a)
|
||||
LIBS += $(LIBNAMES:%=-l%)
|
||||
|
||||
ifeq ($(NCURSES), 1)
|
||||
LIBS += -lncurses
|
||||
else
|
||||
LIBS += -lcurses
|
||||
endif
|
||||
|
||||
##
|
||||
## conversion code for old triggers - should only be used for free eressea,
|
||||
## and only for old datafiles.
|
||||
##
|
||||
ifeq ($(CONVERT_TRIGGERS), 1)
|
||||
SUBDIRS += old
|
||||
LIBRARIES += $(PUBLISH_DIR)/libe-compat.a
|
||||
LIBS += -le-compat
|
||||
endif
|
||||
|
||||
# executable:
|
||||
$(BUILD_DIR)/$(BINARY):: $(BUILD_DIR) $(OBJECTS) $(LIBDEPS)
|
||||
$(LD) -o $@ $(OBJECTS) $(LDFLAGS)
|
||||
$(INSTALL) $@ $(PUBLISH_DIR)/
|
||||
|
||||
$(PUBLISH_DIR)/$(BINARY): $(BUILD_DIR)/$(BINARY)
|
||||
$(INSTALL) $< $@
|
|
@ -1,7 +0,0 @@
|
|||
WARN = -Wall -ansi -pedantic -Wno-char-subscripts -Wno-parentheses
|
||||
DEBUG = -g ${WARN}
|
||||
LIBS = -lncurses -lm -lefence
|
||||
|
||||
CFLAGS = ${DEBUG} -I.. -I/usr/local/include ${OPT}
|
||||
LDFLAGS = ${DEBUG}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
include ../Makefile.include
|
||||
|
||||
all: atoi36 namegen
|
||||
|
||||
atoi36: atoi36.c
|
||||
$(CC) -I.. -I../common/kernel -I../common/util $(CFLAGS) $(LDFLAGS) -o atoi36 atoi36.c
|
||||
|
||||
namegen:
|
||||
$(CC) -I.. -I../common/kernel -I../common/util $(CFLAGS) $(LDFLAGS) -o namegen namegen.c
|
||||
|
Loading…
Reference in New Issue