projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added also fading in/out global animations to be started/stopped
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 0f8c0997fe9dcff77db7005332cc9ce10e8a5f1a..dcc625cf7e71c6e4fa1d75f592571b4c91687bc5 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-117,6
+117,8
@@
OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# OPTIONS = -O3
ifdef BUILD_DIST # distribution build
# OPTIONS = -O3
ifdef BUILD_DIST # distribution build
+SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) | \
+ sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
OPTIONS = -O3 -Wall
endif
OPTIONS = -O3 -Wall
endif
@@
-138,7
+140,7
@@
SRCS = main.c \
editor.c \
files.c \
tape.c \
editor.c \
files.c \
tape.c \
-
cartoons.c
\
+
anim.c
\
network.c \
netserv.c
network.c \
netserv.c
@@
-156,7
+158,7
@@
OBJS = main.o \
editor.o \
files.o \
tape.o \
editor.o \
files.o \
tape.o \
-
cartoons.o
\
+
anim.o
\
network.o \
netserv.o
network.o \
netserv.o
@@
-213,6
+215,9
@@
all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+ifdef BUILD_DIST
+ strip $(PROGNAME)
+endif
libgame_dir:
@$(MAKE) -C $(LIBGAME_DIR)
libgame_dir:
@$(MAKE) -C $(LIBGAME_DIR)
@@
-265,7
+270,7
@@
$(ICON):
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
graphics_dir:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
graphics_dir:
- @
$(MAKE) -C $(GRAPHICS_DIR)
+ @
test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
clean-obj:
$(MAKE) -C $(LIBGAME_DIR) clean
clean-obj:
$(MAKE) -C $(LIBGAME_DIR) clean
@@
-273,9
+278,6
@@
clean-obj:
$(MAKE) -C $(GAME_SP_DIR) clean
$(RM) $(OBJS)
$(RM) $(RNDLIBS)
$(MAKE) -C $(GAME_SP_DIR) clean
$(RM) $(OBJS)
$(RM) $(RNDLIBS)
-# $(RM) $(LIBGAME)
-# $(RM) $(GAME_EM)
-# $(RM) $(GAME_SP)
clean-ico:
$(RM) $(ICONBASE).ico
clean-ico:
$(RM) $(ICONBASE).ico
@@
-290,6
+292,8
@@
clean: clean-obj clean-ico clean-bin
clean-git: clean auto-conf-clean
@$(MAKE) -C $(GRAPHICS_DIR) clean
clean-git: clean auto-conf-clean
@$(MAKE) -C $(GRAPHICS_DIR) clean
+dist-clean: clean-obj clean-ico
+
# -----------------------------------------------------------------------------
# run and test targets
# -----------------------------------------------------------------------------
# run and test targets
@@
-309,8
+313,6
@@
valgrind:
# development only
# -----------------------------------------------------------------------------
# development only
# -----------------------------------------------------------------------------
-dist-clean: clean-obj
-
tags:
$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
tags:
$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]