X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=2fec8a09bd3fa93e2a2876322592a8d3872336ab;hp=bd5538eae7cb19bdd3894e5c8fdf911a1d3f589e;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=111f9432256ce35b49f4729fd94ee19e2a9b9110

diff --git a/src/Makefile b/src/Makefile
index bd5538ea..2fec8a09 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile (src)
+# Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2006 Holger Schemel <info@artsoft.org>
+# (c) 1995-2014 by Artsoft Entertainment
+#     		    Holger Schemel
+#		    info@artsoft.org
+#		    http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# src/Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -10,29 +15,20 @@
 
 .EXPORT_ALL_VARIABLES:
 
-ifndef PLATFORM				# unknown platform -- try auto detection
-ifdef COMSPEC
-PLATFORM = msdos
-else
+ifndef PLATFORM				# unknown platform -- default to Unix
 PLATFORM = unix
 endif
-endif
-
-ifdef X11_PATH				# path to X11 from top level Makefile
-XINC_PATH = $(X11_PATH)/include
-XLIB_PATH = $(X11_PATH)/lib
-X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH) -lX11
-endif
 
 AR = ar
 RANLIB = ranlib
 ETAGS = etags
 RM = rm -f
 
-BMP2ICO = bmp2ico
+CONVERT = convert
 WINDRES = windres
 
+CONVERT_ICON_ARGS = -transparent black -background transparent
+
 PROGBASE = rocksndiamonds
 
 ifdef SPECIAL_EDITION			# create special edition
@@ -57,15 +53,6 @@ PLATFORM = unix
 TARGET = sdl
 endif
 
-ifeq ($(PLATFORM),os2)			# native compiling to OS/2
-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)			# native compiling to Unix (generic)
 PROFILING_FLAGS = -pg
 endif
@@ -73,21 +60,8 @@ endif
 ifeq ($(PLATFORM),cross-win32)		# cross-compiling to Windows
 PROGNAME = ../$(PROGBASE).exe
 EXTRA_LDFLAGS = -lshfolder -lwsock32
-TARGET = sdl
-endif
-
-ifeq ($(PLATFORM),cross-msdos)		# cross-compiling to MS-DOS
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-TARGET = allegro
-endif
-
-ifeq ($(PLATFORM),msdos)		# native compiling to MS-DOS
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-SYS_CFLAGS = -DTARGET_X11
-SYS_LDFLAGS = -s -lalleg
-RM = del
+# TARGET = sdl
+TARGET = sdl2
 endif
 
 
@@ -95,26 +69,28 @@ endif
 # configuring target
 # -----------------------------------------------------------------------------
 
-ifeq ($(TARGET),x11)			# compiling for X11 target
-SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS)
-endif
-
 ifeq ($(TARGET),sdl)			# compiling for SDL target
-SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
 SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
+ifeq ($(TARGET),sdl2)			# compiling for SDL2 target
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --libs)
+endif
+
 ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
-SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg -lmikmod
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 
-ifeq ($(TARGET),allegro)		# compiling for Allegro target
-SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
-SYS_LDFLAGS = -lalleg
+ifeq ($(TARGET),sdl2-static)		# compiling for SDL2 target (static)
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2 -lmikmod
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --static-libs)
 endif
 
 
@@ -144,7 +120,7 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
 
 CONFIG = $(CONFIG_GAME) $(JOYSTICK)
-# DEBUG = -DDEBUG -g
+DEBUG = -DDEBUG -g
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
@@ -218,7 +194,7 @@ CNFS =	conf_gfx.h	\
 	conf_var.c	\
 	conf_act.c
 
-CNFS_CMD = ../Scripts/create_element_defs.pl
+CNFS_CMD = ../build-scripts/create_element_defs.pl
 
 TIMESTAMP_FILE = conftime.h
 
@@ -228,16 +204,23 @@ LIBGAME = $(LIBGAME_DIR)/libgame.a
 GAME_EM_DIR = game_em
 GAME_EM = $(GAME_EM_DIR)/game_em.a
 
-RNDLIBS = $(LIBGAME) $(GAME_EM)
+GAME_SP_DIR = game_sp
+GAME_SP = $(GAME_SP_DIR)/game_sp.a
+
+RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
+AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
+ICON_BASEPATH = ../Special/Icons/windows_icons
 ifeq ($(PLATFORM),cross-win32)
 ifdef SPECIAL_EDITION
-ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+# ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+ICON_PATH = $(ICON_BASEPATH)/$(SPECIAL_EDITION)
 else
-ICONSUFFIX = 32x32
+# ICONSUFFIX = 32x32
+ICON_PATH = $(ICON_BASEPATH)/default
 endif
-ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
+# ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
 ICON = $(ICONBASE).o
 endif
 
@@ -246,7 +229,7 @@ endif
 # build targets
 # -----------------------------------------------------------------------------
 
-all: libgame_dir game_em_dir $(PROGNAME)
+all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME)
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
@@ -261,6 +244,11 @@ game_em_dir:
 $(GAME_EM):
 	@$(MAKE) -C $(GAME_EM_DIR)
 
+game_sp_dir:
+	@$(MAKE) -C $(GAME_SP_DIR)
+$(GAME_SP):
+	@$(MAKE) -C $(GAME_SP_DIR)
+
 auto-conf:
 	@for i in $(CNFS); do			\
 		echo "$(CNFS_CMD) $$i > $$i";	\
@@ -276,13 +264,15 @@ conf_snd.h: conf_snd.c
 conf_mus.h: conf_mus.c
 	@$(MAKE) auto-conf
 
-$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM)
+# $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
+$(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
 	@date '+"%Y-%m-%d %H:%M"' \
 	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
 	> $(TIMESTAMP_FILE)
 
 $(ICON):
-	$(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
+#	$(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
+	$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
 
 .c.o:
@@ -291,9 +281,12 @@ $(ICON):
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean
 	$(MAKE) -C $(GAME_EM_DIR) clean
+	$(MAKE) -C $(GAME_SP_DIR) clean
 	$(RM) $(OBJS)
-	$(RM) $(LIBGAME)
-	$(RM) $(GAME_EM)
+	$(RM) $(RNDLIBS)
+#	$(RM) $(LIBGAME)
+#	$(RM) $(GAME_EM)
+#	$(RM) $(GAME_SP)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -310,13 +303,13 @@ clean: clean-obj clean-ico clean-bin
 # run and test targets
 # -----------------------------------------------------------------------------
 
-run: all
+run:
 	cd .. && ./$(PROGBASE) --verbose
 
-gdb: all
+gdb:
 	cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
 
-valgrind: all
+valgrind:
 	cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out
 
 
@@ -327,11 +320,12 @@ valgrind: all
 dist-clean: clean-obj
 
 tags:
-	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch]
+	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
 
 depend:
 	$(MAKE) -C $(LIBGAME_DIR) depend
 	$(MAKE) -C $(GAME_EM_DIR) depend
+	$(MAKE) -C $(GAME_SP_DIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
 ifeq (.depend,$(wildcard .depend))