projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040816-1-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index fed7f7ce6eb8ff60fb81a37ba5a6260747905f2e..2fdc412c9c23de2d9c84f031a794aab6e8aa9652 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-194,8
+194,13
@@
CNFS_CMD = ../Scripts/create_element_defs.pl
TIMESTAMP_FILE = conftime.h
TIMESTAMP_FILE = conftime.h
-LIBDIR = libgame
-LIBGAME = $(LIBDIR)/libgame.a
+LIBGAMEDIR = libgame
+LIBGAME = $(LIBGAMEDIR)/libgame.a
+
+LIBEMDIR = libem
+LIBEM = $(LIBEMDIR)/libem.a
+
+RNDLIBS = $(LIBGAME) $(LIBEM)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
@@
-208,15
+213,20
@@
endif
# build targets
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
-all: libgame_dir $(PROGNAME)
+all: libgame_dir
libem_dir
$(PROGNAME)
-$(PROGNAME): $(
LIBGAME
) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
- $(CC) $(PROFILING) $(OBJS) $(ICON) $(
LIBGAME
) $(LDFLAGS) -o $(PROGNAME)
+$(PROGNAME): $(
RNDLIBS
) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
+ $(CC) $(PROFILING) $(OBJS) $(ICON) $(
RNDLIBS
) $(LDFLAGS) -o $(PROGNAME)
libgame_dir:
libgame_dir:
- @$(MAKE) -C $(LIBDIR)
+ @$(MAKE) -C $(LIB
GAME
DIR)
$(LIBGAME):
$(LIBGAME):
- @$(MAKE) -C $(LIBDIR)
+ @$(MAKE) -C $(LIBGAMEDIR)
+
+libem_dir:
+ @$(MAKE) -C $(LIBEMDIR)
+$(LIBEM):
+ @$(MAKE) -C $(LIBEMDIR)
auto-conf:
@for i in $(CNFS); do \
auto-conf:
@for i in $(CNFS); do \
@@
-233,7
+243,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)
+$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME)
$(LIBEM)
@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)
@@
-246,9
+256,11
@@
$(ICON):
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
clean-obj:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
clean-obj:
- $(MAKE) -C $(LIBDIR) clean
+ $(MAKE) -C $(LIBGAMEDIR) clean
+ $(MAKE) -C $(LIBEMDIR) clean
$(RM) $(OBJS)
$(RM) $(LIBGAME)
$(RM) $(OBJS)
$(RM) $(LIBGAME)
+ $(RM) $(LIBEM)
clean-ico:
$(RM) $(ICONBASE).ico
clean-ico:
$(RM) $(ICONBASE).ico
@@
-268,7
+280,8
@@
clean: clean-obj clean-ico clean-bin
dist-clean: clean-obj
depend:
dist-clean: clean-obj
depend:
- $(MAKE) -C $(LIBDIR) depend
+ $(MAKE) -C $(LIBGAMEDIR) depend
+ $(MAKE) -C $(LIBEMDIR) 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))