Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Kleine Änderungen im Makefile 

- Beispiel für Custom-Einstellungen in Makefile.corwin
- Fehlender Prototyp für igetstrtoken()
This commit is contained in:
Christian Schlittchen 2001-01-30 16:14:16 +00:00
parent 5a70c40b47
commit c0ed63b84a
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -8,6 +8,12 @@ SUBDIRS = \
# askalon \ # askalon \
# tools \ # tools \
ifeq ($(HOST),amber)
ifeq ($(USER),eressea)
include Makefile.corwin
endif
endif
include Makefile.include include Makefile.include

8
src/Makefile.corwin Normal file
View File

@ -0,0 +1,8 @@
ifndef ERESSEA
export ERESSEA=$(PWD)
endif
# Hier definieren, damit nicht '@gcc'
export CC=gcc

10
src/Makefile.include
View File

@ -13,8 +13,8 @@ ARFLAGS = cr
CTAGS = ctags CTAGS = ctags
CTAGSFLAGS = --langmap=c:.c.h CTAGSFLAGS = --langmap=c:.c.h
CC = gcc CC ?= @gcc
CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \ CFLAGS ?= -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
-Wpointer-arith -Werror-implicit-function-declaration \ -Wpointer-arith -Werror-implicit-function-declaration \
-Wno-char-subscripts \ -Wno-char-subscripts \
-march=pentiumpro -fPIC $(INCLUDES) -march=pentiumpro -fPIC $(INCLUDES)
@ -58,7 +58,8 @@ endif
ifeq ($(CONFIG), release) ifeq ($(CONFIG), release)
BUILD_DIR = Release-$(ARCHITECTURE) BUILD_DIR = Release-$(ARCHITECTURE)
CFLAGS += -O4 -funroll-loops -fomit-frame-pointer CFLAGS += -O4 -s -funroll-loops -fomit-frame-pointer
LDFLAGS += -s
endif endif
ifeq ($(CONFIG), profile) ifeq ($(CONFIG), profile)
@ -81,6 +82,7 @@ depend::
$(DEPEND) $(CFLAGS) $(DEFINES) $(INCDIRS) $(SOURCES) >| .depend $(DEPEND) $(CFLAGS) $(DEFINES) $(INCDIRS) $(SOURCES) >| .depend
endif endif
# #
## Tags ## Tags
# #
@ -135,7 +137,7 @@ $(BUILD_DIR) $(PUBLISH_DIR):
$(BUILD_DIR)/%:: $(BUILD_DIR) $(BUILD_DIR)/%:: $(BUILD_DIR)
$(BUILD_DIR)/%.o:: %.c $(BUILD_DIR)/%.o:: %.c
@echo "Compiling $@" @echo "Compiling $@"
@$(CC) -o $@ -c $< $(CFLAGS) $(CC) $(CFLAGS) -o $@ -c $<
## ##
## conversion code for old triggers - should only be used for free eressea, ## conversion code for old triggers - should only be used for free eressea,

3
src/common/kernel/eressea.h
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: eressea.h,v 1.3 2001/01/28 08:01:51 enno Exp $ * $Id: eressea.h,v 1.4 2001/01/30 16:14:16 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -932,6 +932,7 @@ int geti(void);
keyword_t igetkeyword(const char *s); keyword_t igetkeyword(const char *s);
keyword_t getkeyword(void); keyword_t getkeyword(void);
keyword_t findkeyword(const char *s); keyword_t findkeyword(const char *s);
char *igetstrtoken(const char *s);
#define BASE36_VERSION 93 #define BASE36_VERSION 93
extern int atoi36(const char * s); extern int atoi36(const char * s);