rocksndiamonds-3.0.6

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index c994eaa93e59cc78ccbdb4d23bf1aa8109974825..3ca01a688fd62799edd80e95058442624e042d60 100644 (file)
--- 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
@@ -75,8 +76,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 +107,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
@@ -161,7 +166,9 @@ CNFS =      conf_gfx.h      \
        conf_cus.c      \
        conf_cus.h      \
        conf_e2g.c      \
-       conf_esg.c
+       conf_esg.c      \
+       conf_e2s.c      \
+       conf_fnt.c
 
 CNFS_CMD = ../Scripts/create_element_defs.pl