projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060819-3-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 2fdc412c9c23de2d9c84f031a794aab6e8aa9652..5c273676726ba290a4a7cf5743181bbec63ff967 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,7
+1,7
@@
# =============================================================================
# Rocks'n'Diamonds Makefile (src)
# -----------------------------------------------------------------------------
# =============================================================================
# Rocks'n'Diamonds Makefile (src)
# -----------------------------------------------------------------------------
-# (c) 1995-200
3
Holger Schemel <info@artsoft.org>
+# (c) 1995-200
6
Holger Schemel <info@artsoft.org>
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-27,6
+27,7
@@
endif
AR = ar
RANLIB = ranlib
AR = ar
RANLIB = ranlib
+ETAGS = etags
BMP2ICO = bmp2ico
WINDRES = windres
BMP2ICO = bmp2ico
WINDRES = windres
@@
-94,6
+95,12
@@
SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
endif
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
endif
+ifeq ($(TARGET),sdl-static)
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
+endif
+
ifeq ($(TARGET),allegro)
SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
SYS_LDFLAGS = -lalleg
ifeq ($(TARGET),allegro)
SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
SYS_LDFLAGS = -lalleg
@@
-194,13
+201,13
@@
CNFS_CMD = ../Scripts/create_element_defs.pl
TIMESTAMP_FILE = conftime.h
TIMESTAMP_FILE = conftime.h
-LIBGAMEDIR = libgame
-LIBGAME = $(LIBGAMEDIR)/libgame.a
+LIBGAME
_
DIR = libgame
+LIBGAME = $(LIBGAME
_
DIR)/libgame.a
-
LIBEMDIR = lib
em
-
LIBEM = $(LIBEMDIR)/lib
em.a
+
GAME_EM_DIR = game_
em
+
GAME_EM = $(GAME_EM_DIR)/game_
em.a
-RNDLIBS = $(LIBGAME) $(
LIB
EM)
+RNDLIBS = $(LIBGAME) $(
GAME_
EM)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
@@
-213,20
+220,20
@@
endif
# build targets
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
-all: libgame_dir
lib
em_dir $(PROGNAME)
+all: libgame_dir
game_
em_dir $(PROGNAME)
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
libgame_dir:
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
libgame_dir:
- @$(MAKE) -C $(LIBGAMEDIR)
+ @$(MAKE) -C $(LIBGAME
_
DIR)
$(LIBGAME):
$(LIBGAME):
- @$(MAKE) -C $(LIBGAMEDIR)
+ @$(MAKE) -C $(LIBGAME
_
DIR)
-
lib
em_dir:
- @$(MAKE) -C $(
LIBEM
DIR)
-$(
LIB
EM):
- @$(MAKE) -C $(
LIBEM
DIR)
+
game_
em_dir:
+ @$(MAKE) -C $(
GAME_EM_
DIR)
+$(
GAME_
EM):
+ @$(MAKE) -C $(
GAME_EM_
DIR)
auto-conf:
@for i in $(CNFS); do \
auto-conf:
@for i in $(CNFS); do \
@@
-243,7
+250,7
@@
conf_snd.h: conf_snd.c
conf_mus.h: conf_mus.c
@$(MAKE) auto-conf
conf_mus.h: conf_mus.c
@$(MAKE) auto-conf
-$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(
LIB
EM)
+$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(
GAME_
EM)
@date '+"[%Y-%m-%d %H:%M]"' \
| sed -e 's/^/#define COMPILE_DATE_STRING /' \
> $(TIMESTAMP_FILE)
@date '+"[%Y-%m-%d %H:%M]"' \
| sed -e 's/^/#define COMPILE_DATE_STRING /' \
> $(TIMESTAMP_FILE)
@@
-256,11
+263,11
@@
$(ICON):
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
clean-obj:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
clean-obj:
- $(MAKE) -C $(LIBGAMEDIR) clean
- $(MAKE) -C $(
LIBEM
DIR) clean
+ $(MAKE) -C $(LIBGAME
_
DIR) clean
+ $(MAKE) -C $(
GAME_EM_
DIR) clean
$(RM) $(OBJS)
$(RM) $(LIBGAME)
$(RM) $(OBJS)
$(RM) $(LIBGAME)
- $(RM) $(
LIB
EM)
+ $(RM) $(
GAME_
EM)
clean-ico:
$(RM) $(ICONBASE).ico
clean-ico:
$(RM) $(ICONBASE).ico
@@
-279,9
+286,12
@@
clean: clean-obj clean-ico clean-bin
dist-clean: clean-obj
dist-clean: clean-obj
+tags:
+ $(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch]
+
depend:
depend:
- $(MAKE) -C $(LIBGAMEDIR) depend
- $(MAKE) -C $(
LIBEM
DIR) depend
+ $(MAKE) -C $(LIBGAME
_
DIR) depend
+ $(MAKE) -C $(
GAME_EM_
DIR) depend
for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
ifeq (.depend,$(wildcard .depend))
for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
ifeq (.depend,$(wildcard .depend))