X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=595f5996acb4a4770dcf80e888de840d08f2ee3d;hb=ea933dd51bfca7ddcc6b75465476cce57afd1682;hp=e935b51d4715fd8bc1c6fababb8cbf01e98f710a;hpb=688d5ecd9dd6a29a959a6becf05c5fcba7fc90af;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index e935b51d..595f5996 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -64,6 +64,7 @@ TARGET = allegro
 endif
 
 ifeq ($(PLATFORM),cross-win32)
+EXTRA_LDFLAGS = -lshfolder
 PROGNAME = ../$(PROGBASE).exe
 TARGET = sdl
 endif
@@ -102,11 +103,12 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
-# DEBUG = -DDEBUG -g
+DEBUG = -DDEBUG -g
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
-OPTIONS = $(DEBUG) -O3 -Wall			# only for debugging purposes
+# OPTIONS = $(DEBUG) -O3 -Wall			# only for debugging purposes
+OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
 # OPTIONS = $(DEBUG) -Wall -ansi -pedantic	# only for debugging purposes
 # OPTIONS = -O3 -Wall -ansi -pedantic
 # OPTIONS = -O3 -Wall
@@ -122,6 +124,8 @@ LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
 
 SRCS =	main.c		\
+	conf_gfx.c	\
+	conf_snd.c	\
 	init.c		\
 	config.c	\
 	events.c	\
@@ -136,6 +140,8 @@ SRCS =	main.c		\
 	netserv.c
 
 OBJS =	main.o		\
+	conf_gfx.o	\
+	conf_snd.o	\
 	init.o		\
 	config.o	\
 	events.o	\
@@ -149,6 +155,19 @@ OBJS =	main.o		\
 	network.o	\
 	netserv.o
 
+CNFS =	conf_gfx.h	\
+	conf_snd.h	\
+	conf_chr.c	\
+	conf_chr.h	\
+	conf_cus.c	\
+	conf_cus.h	\
+	conf_e2g.c	\
+	conf_esg.c	\
+	conf_e2s.c	\
+	conf_fnt.c
+
+CNFS_CMD = ../Scripts/create_element_defs.pl
+
 TIMESTAMP_FILE = conftime.h
 
 LIBDIR = libgame
@@ -171,7 +190,19 @@ libgame_dir:
 $(LIBGAME):
 	@$(MAKE) -C $(LIBDIR)
 
-$(TIMESTAMP_FILE): $(SRCS)
+auto-conf:
+	@for i in $(CNFS); do			\
+		echo "$(CNFS_CMD) $$i > $$i";	\
+		$(CNFS_CMD) $$i > $$i;		\
+	done
+
+conf_gfx.h: conf_gfx.c
+	@$(MAKE) auto-conf
+
+conf_snd.h: conf_snd.c
+	@$(MAKE) auto-conf
+
+$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME)
 	@date '+"[%Y-%m-%d %H:%M]"' \
 	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
 	> $(TIMESTAMP_FILE)