projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20051228-2-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 05eccd9916ed18c56496318ab01a9216a5f4c6b0..4cd0223f346f74ffcf1c2d343fc13504c8065592 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
5
Holger Schemel <info@artsoft.org>
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-22,11
+22,12
@@
ifdef X11_PATH # path to X11 specified by top level Makefile
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
X11_INCL = -I$(XINC_PATH)
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH)
+X11_LIBS = -L$(XLIB_PATH)
-lX11
endif
AR = ar
RANLIB = ranlib
endif
AR = ar
RANLIB = ranlib
+ETAGS = etags
BMP2ICO = bmp2ico
WINDRES = windres
BMP2ICO = bmp2ico
WINDRES = windres
@@
-55,7
+56,16
@@
endif
ifeq ($(PLATFORM),macosx)
PLATFORM = unix
ifeq ($(PLATFORM),macosx)
PLATFORM = unix
-TARGET=sdl
+TARGET = sdl
+endif
+
+ifeq ($(PLATFORM),os2)
+RANLIB = echo
+PROGNAME = ../$(PROGBASE).exe
+EXTRA_CFLAGS = -Zbin-files -D__ST_MT_ERRNO__ -Zmtd -fomit-frame-pointer
+EXTRA_LDFLAGS = -lsocket
+PLATFORM = unix
+TARGET = x11
endif
ifeq ($(PLATFORM),unix)
endif
ifeq ($(PLATFORM),unix)
@@
-69,23
+79,26
@@
TARGET = allegro
endif
ifeq ($(PLATFORM),cross-win32)
endif
ifeq ($(PLATFORM),cross-win32)
-EXTRA_LDFLAGS = -lshfolder
+EXTRA_LDFLAGS = -lshfolder
-lwsock32
PROGNAME = ../$(PROGBASE).exe
TARGET = sdl
endif
ifeq ($(TARGET),x11)
SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
PROGNAME = ../$(PROGBASE).exe
TARGET = sdl
endif
ifeq ($(TARGET),x11)
SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS)
-lX11
+SYS_LDFLAGS = $(X11_LIBS)
endif
ifeq ($(TARGET),sdl)
SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
endif
ifeq ($(TARGET),sdl)
SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
-ifeq ($(PLATFORM),macosx)
-SYS_LDFLAGS = -lSDL_image -lSDL_mixer -lsmpeg $(shell sdl-config --libs)
-else
-SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --libs)
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
endif
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)
endif
ifeq ($(TARGET),allegro)
@@
-112,7
+125,7
@@
CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
-
#
DEBUG = -DDEBUG -g
+DEBUG = -DDEBUG -g
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
@@
-128,8
+141,8
@@
ifdef BUILD_DIST # distribution build
OPTIONS = -O3 -Wall
endif
OPTIONS = -O3 -Wall
endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS)
$(EXTRA_CFLAGS)
$(CONFIG)
+LDFLAGS =
$(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
SRCS = main.c \
SRCS = main.c \
@@
-175,6
+188,8
@@
CNFS = conf_gfx.h \
conf_chr.h \
conf_cus.c \
conf_cus.h \
conf_chr.h \
conf_cus.c \
conf_cus.h \
+ conf_grp.c \
+ conf_grp.h \
conf_e2g.c \
conf_esg.c \
conf_e2s.c \
conf_e2g.c \
conf_esg.c \
conf_e2s.c \
@@
-186,8
+201,13
@@
CNFS_CMD = ../Scripts/create_element_defs.pl
TIMESTAMP_FILE = conftime.h
TIMESTAMP_FILE = conftime.h
-LIBDIR = libgame
-LIBGAME = $(LIBDIR)/libgame.a
+LIBGAME_DIR = libgame
+LIBGAME = $(LIBGAME_DIR)/libgame.a
+
+GAME_EM_DIR = game_em
+GAME_EM = $(GAME_EM_DIR)/game_em.a
+
+RNDLIBS = $(LIBGAME) $(GAME_EM)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
@@
-200,15
+220,20
@@
endif
# build targets
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
-all: libgame_dir $(PROGNAME)
+all: libgame_dir
game_em_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 $(LIBGAME_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 \
@@
-225,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)
+$(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)
@@
-238,9
+263,11
@@
$(ICON):
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
clean-obj:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
clean-obj:
- $(MAKE) -C $(LIBDIR) clean
+ $(MAKE) -C $(LIBGAME_DIR) clean
+ $(MAKE) -C $(GAME_EM_DIR) clean
$(RM) $(OBJS)
$(RM) $(LIBGAME)
$(RM) $(OBJS)
$(RM) $(LIBGAME)
+ $(RM) $(GAME_EM)
clean-ico:
$(RM) $(ICONBASE).ico
clean-ico:
$(RM) $(ICONBASE).ico
@@
-259,8
+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 $(LIBDIR) 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))