rnd-20040322-B-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 05eccd9916ed18c56496318ab01a9216a5f4c6b0..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)
@@ -112,7 +122,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
@@ -128,8 +138,8 @@ 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          \
@@ -175,6 +185,8 @@ CNFS =      conf_gfx.h      \
        conf_chr.h      \
        conf_cus.c      \
        conf_cus.h      \
+       conf_grp.c      \
+       conf_grp.h      \
        conf_e2g.c      \
        conf_esg.c      \
        conf_e2s.c      \