X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=fed7f7ce6eb8ff60fb81a37ba5a6260747905f2e;hb=1adb39b83ff3b555b57d6132a6a26954718947fb;hp=46a9ddd29df4b9bc7fbe225afb15fa1913ef2c5e;hpb=59a0f12212d28da5f2ae9a92c6b7371886dab38c;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 46a9ddd2..fed7f7ce 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,7 @@ ifdef X11_PATH			# path to X11 specified by top level Makefile
 XINC_PATH = $(X11_PATH)/include
 XLIB_PATH = $(X11_PATH)/lib
 X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH)
+X11_LIBS = -L$(XLIB_PATH) -lX11
 endif
 
 AR = ar
@@ -55,7 +55,16 @@ endif
 
 ifeq ($(PLATFORM),macosx)
 PLATFORM = unix
-TARGET=sdl
+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)
@@ -69,23 +78,20 @@ TARGET = allegro
 endif
 
 ifeq ($(PLATFORM),cross-win32)
-EXTRA_LDFLAGS = -lshfolder
+EXTRA_LDFLAGS = -lshfolder -lwsock32
 PROGNAME = ../$(PROGBASE).exe
 TARGET = sdl
 endif
 
 ifeq ($(TARGET),x11)
 SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS) -lX11
+SYS_LDFLAGS = $(X11_LIBS)
 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
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),allegro)
@@ -128,13 +134,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 +159,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 +176,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 +230,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 /' \