rocksndiamonds-3.0.7

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index eb74406aa0d94f97cbf62626dfe7b8d0a5424aa9..61285b02c2878a4bcaafc325f15063b64804edd7 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,16 @@
-#=============================================================================#
-# Makefile for Rocks'n'Diamonds                                               #
-# (c) 1995-2002 Holger Schemel, info@artsoft.org                              #
-#=============================================================================#
+# =============================================================================
+# Rocks'n'Diamonds Makefile (src)
+# -----------------------------------------------------------------------------
+# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# =============================================================================
+
+# -----------------------------------------------------------------------------
+# configuration
+# -----------------------------------------------------------------------------
 
 .EXPORT_ALL_VARIABLES:
 
-ifndef PLATFORM                        # platform not specified -- try auto detection
+ifndef PLATFORM                        # no platform specified -- try auto detection
 ifdef COMSPEC
 PLATFORM = msdos
 else
@@ -64,6 +69,7 @@ TARGET = allegro
 endif
 
 ifeq ($(PLATFORM),cross-win32)
+EXTRA_LDFLAGS = -lshfolder
 PROGNAME = ../$(PROGBASE).exe
 TARGET = sdl
 endif
@@ -75,8 +81,12 @@ 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
+endif
 
 ifeq ($(TARGET),allegro)
 SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
@@ -102,7 +112,7 @@ 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
@@ -162,6 +172,7 @@ CNFS =      conf_gfx.h      \
        conf_cus.h      \
        conf_e2g.c      \
        conf_esg.c      \
+       conf_e2s.c      \
        conf_fnt.c
 
 CNFS_CMD = ../Scripts/create_element_defs.pl
@@ -178,6 +189,10 @@ ICON = $(ICONBASE).o
 endif
 
 
+# -----------------------------------------------------------------------------
+# build targets
+# -----------------------------------------------------------------------------
+
 all: libgame_dir $(PROGNAME)
 
 $(PROGNAME): $(LIBGAME) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
@@ -228,9 +243,9 @@ clean-bin:
 clean: clean-obj clean-ico clean-bin
 
 
-#-----------------------------------------------------------------------------#
-# development only stuff                                                      #
-#-----------------------------------------------------------------------------#
+# -----------------------------------------------------------------------------
+# development only
+# -----------------------------------------------------------------------------
 
 dist-clean: clean-obj