X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=0512cf8029a2f6a23bdc9091624273c6b5cd8f23;hb=942ec4881e3b21c130df9ae105d06c2c633fa192;hp=dd6896bf53b9e7fee6491fe1431495fd3a87f080;hpb=3607ef8e4000754063935d908053d564de92c0a2;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index dd6896bf..0512cf80 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,6 +41,7 @@ PROGNAME = ../$(PROGBASE).exe
 SYS_CFLAGS = -DTARGET_X11
 SYS_LDFLAGS = -s -lalleg
 
+
 else				# Unix or cross-compiling for MS-DOS and Win32
 
 RM = rm -f
@@ -76,7 +77,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)
@@ -136,6 +138,7 @@ SRCS =	main.c		\
 	conf_gfx.c	\
 	conf_snd.c	\
 	conf_mus.c	\
+	conf_dem.c	\
 	init.c		\
 	config.c	\
 	events.c	\
@@ -153,6 +156,7 @@ OBJS =	main.o		\
 	conf_gfx.o	\
 	conf_snd.o	\
 	conf_mus.o	\
+	conf_dem.o	\
 	init.o		\
 	config.o	\
 	events.o	\
@@ -176,7 +180,9 @@ CNFS =	conf_gfx.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