rnd-20040322-B-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 46a9ddd29df4b9bc7fbe225afb15fa1913ef2c5e..ef1f52af1cd9b8b1be223b2036c4533f0076c8b3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -58,6 +58,15 @@ PLATFORM = unix
 TARGET=sdl
 endif
 
+ifeq ($(PLATFORM),os2)
+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)
 PROFILING_FLAGS = -pg
 endif
@@ -76,7 +85,8 @@ endif
 
 ifeq ($(TARGET),x11)
 SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS) -lX11
+# SYS_LDFLAGS = $(X11_LIBS) -lX11
+SYS_LDFLAGS = $(XLIB_PATH)/libX11.a
 endif
 
 ifeq ($(TARGET),sdl)
@@ -128,13 +138,15 @@ ifdef BUILD_DIST                          # distribution build
 OPTIONS = -O3 -Wall
 endif
 
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
 
 SRCS = main.c          \
        conf_gfx.c      \
        conf_snd.c      \
+       conf_mus.c      \
+       conf_hlp.c      \
        init.c          \
        config.c        \
        events.c        \
@@ -151,6 +163,8 @@ SRCS =      main.c          \
 OBJS = main.o          \
        conf_gfx.o      \
        conf_snd.o      \
+       conf_mus.o      \
+       conf_hlp.o      \
        init.o          \
        config.o        \
        events.o        \
@@ -166,14 +180,19 @@ OBJS =    main.o          \
 
 CNFS = conf_gfx.h      \
        conf_snd.h      \
+       conf_mus.h      \
        conf_chr.c      \
        conf_chr.h      \
        conf_cus.c      \
        conf_cus.h      \
+       conf_grp.c      \
+       conf_grp.h      \
        conf_e2g.c      \
        conf_esg.c      \
        conf_e2s.c      \
-       conf_fnt.c
+       conf_fnt.c      \
+       conf_g2s.c      \
+       conf_g2m.c
 
 CNFS_CMD = ../Scripts/create_element_defs.pl
 
@@ -215,6 +234,9 @@ conf_gfx.h: conf_gfx.c
 conf_snd.h: conf_snd.c
        @$(MAKE) auto-conf
 
+conf_mus.h: conf_mus.c
+       @$(MAKE) auto-conf
+
 $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME)
        @date '+"[%Y-%m-%d %H:%M]"' \
        | sed -e 's/^/#define COMPILE_DATE_STRING /' \