rnd-20070425-1-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 2fdc412c9c23de2d9c84f031a794aab6e8aa9652..8d8df9422341556b7b0d5c2ce7a059ed7a01bba2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile (src)
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2006 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -27,6 +27,7 @@ endif
 
 AR = ar
 RANLIB = ranlib
+ETAGS = etags
 
 BMP2ICO = bmp2ico
 WINDRES = windres
@@ -54,6 +55,7 @@ PLATFORM = unix
 endif
 
 ifeq ($(PLATFORM),macosx)
+EXTRA_LDFLAGS = -lstdc++
 PLATFORM = unix
 TARGET = sdl
 endif
@@ -94,6 +96,12 @@ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
 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
@@ -188,23 +196,30 @@ CNFS =    conf_gfx.h      \
        conf_e2s.c      \
        conf_fnt.c      \
        conf_g2s.c      \
-       conf_g2m.c
+       conf_g2m.c      \
+       conf_var.c      \
+       conf_act.c
 
 CNFS_CMD = ../Scripts/create_element_defs.pl
 
 TIMESTAMP_FILE = conftime.h
 
-LIBGAMEDIR = libgame
-LIBGAME = $(LIBGAMEDIR)/libgame.a
+LIBGAME_DIR = libgame
+LIBGAME = $(LIBGAME_DIR)/libgame.a
 
-LIBEMDIR = libem
-LIBEM = $(LIBEMDIR)/libem.a
+GAME_EM_DIR = game_em
+GAME_EM = $(GAME_EM_DIR)/game_em.a
 
-RNDLIBS = $(LIBGAME) $(LIBEM)
+RNDLIBS = $(LIBGAME) $(GAME_EM)
 
 ICONBASE = windows_icon
 ifeq ($(PLATFORM),cross-win32)
-ICON32X32 = ../graphics/$(ICONBASE)_32x32.bmp
+ifdef SPECIAL_ICON
+ICONSUFFIX = 32x32_$(SPECIAL_ICON)
+else
+ICONSUFFIX = 32x32
+endif
+ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
 ICON = $(ICONBASE).o
 endif
 
@@ -213,20 +228,20 @@ endif
 # build targets
 # -----------------------------------------------------------------------------
 
-all: libgame_dir libem_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:
-       @$(MAKE) -C $(LIBGAMEDIR)
+       @$(MAKE) -C $(LIBGAME_DIR)
 $(LIBGAME):
-       @$(MAKE) -C $(LIBGAMEDIR)
+       @$(MAKE) -C $(LIBGAME_DIR)
 
-libem_dir:
-       @$(MAKE) -C $(LIBEMDIR)
-$(LIBEM):
-       @$(MAKE) -C $(LIBEMDIR)
+game_em_dir:
+       @$(MAKE) -C $(GAME_EM_DIR)
+$(GAME_EM):
+       @$(MAKE) -C $(GAME_EM_DIR)
 
 auto-conf:
        @for i in $(CNFS); do                   \
@@ -243,8 +258,8 @@ conf_snd.h: conf_snd.c
 conf_mus.h: conf_mus.c
        @$(MAKE) auto-conf
 
-$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(LIBEM)
-       @date '+"[%Y-%m-%d %H:%M]"' \
+$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM)
+       @date '+"%Y-%m-%d %H:%M"' \
        | sed -e 's/^/#define COMPILE_DATE_STRING /' \
        > $(TIMESTAMP_FILE)
 
@@ -256,11 +271,11 @@ $(ICON):
        $(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 clean-obj:
-       $(MAKE) -C $(LIBGAMEDIR) clean
-       $(MAKE) -C $(LIBEMDIR) clean
+       $(MAKE) -C $(LIBGAME_DIR) clean
+       $(MAKE) -C $(GAME_EM_DIR) clean
        $(RM) $(OBJS)
        $(RM) $(LIBGAME)
-       $(RM) $(LIBEM)
+       $(RM) $(GAME_EM)
 
 clean-ico:
        $(RM) $(ICONBASE).ico
@@ -279,9 +294,12 @@ clean: clean-obj clean-ico clean-bin
 
 dist-clean: clean-obj
 
+tags:
+       $(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch]
+
 depend:
-       $(MAKE) -C $(LIBGAMEDIR) depend
-       $(MAKE) -C $(LIBEMDIR) 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))