rnd-20031011-3-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 89e047585eadb073b4b59c7f6f54f5fdf477aaad..d611cd933bd87dac7adc11da0dead917b71baf05 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
@@ -106,7 +111,8 @@ 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
@@ -160,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