X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=286a5c9a0676af2a26e8cb13d1fd2dcda954741b;hb=6413b637e99f65b72fa0bbb007e6dc4dd03196d1;hp=f4ffbc8a9894fe9e3a3b173c229236f81276a41c;hpb=3a503b2292cd93a5c67cda25e8912391eb12273b;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index f4ffbc8a..286a5c9a 100644
--- 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-2005 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)
-X11_LIBS = -L$(XLIB_PATH)
+X11_LIBS = -L$(XLIB_PATH) -lX11
 endif
 
 AR = ar
 RANLIB = ranlib
+ETAGS = etags
 
 BMP2ICO = bmp2ico
 WINDRES = windres
@@ -55,7 +56,16 @@ endif
 
 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)
@@ -69,23 +79,20 @@ TARGET = allegro
 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)
-SYS_LDFLAGS = $(X11_LIBS) -lX11
+SYS_LDFLAGS = $(X11_LIBS)
 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)
-endif
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),allegro)
@@ -128,15 +135,15 @@ ifdef BUILD_DIST				# distribution build
 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		\
 	conf_gfx.c	\
 	conf_snd.c	\
 	conf_mus.c	\
-	conf_inf.c	\
+	conf_hlp.c	\
 	init.c		\
 	config.c	\
 	events.c	\
@@ -154,7 +161,7 @@ OBJS =	main.o		\
 	conf_gfx.o	\
 	conf_snd.o	\
 	conf_mus.o	\
-	conf_inf.o	\
+	conf_hlp.o	\
 	init.o		\
 	config.o	\
 	events.o	\
@@ -175,6 +182,8 @@ CNFS =	conf_gfx.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	\
@@ -186,8 +195,13 @@ CNFS_CMD = ../Scripts/create_element_defs.pl
 
 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)
@@ -200,15 +214,20 @@ endif
 # 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:
-	@$(MAKE) -C $(LIBDIR)
+	@$(MAKE) -C $(LIBGAME_DIR)
 $(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			\
@@ -225,7 +244,7 @@ conf_snd.h: conf_snd.c
 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)
@@ -238,9 +257,11 @@ $(ICON):
 	$(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) $(GAME_EM)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -259,8 +280,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 $(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))