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

diff --git a/src/Makefile b/src/Makefile
index 0512cf80..976f86bc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,7 +41,6 @@ PROGNAME = ../$(PROGBASE).exe
 SYS_CFLAGS = -DTARGET_X11
 SYS_LDFLAGS = -s -lalleg
 
-
 else				# Unix or cross-compiling for MS-DOS and Win32
 
 RM = rm -f
@@ -77,8 +76,7 @@ endif
 
 ifeq ($(TARGET),x11)
 SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-# SYS_LDFLAGS = $(X11_LIBS) -lX11
-SYS_LDFLAGS = $(XLIB_PATH)/libX11.a
+SYS_LDFLAGS = $(X11_LIBS) -lX11
 endif
 
 ifeq ($(TARGET),sdl)
@@ -138,7 +136,7 @@ SRCS =	main.c		\
 	conf_gfx.c	\
 	conf_snd.c	\
 	conf_mus.c	\
-	conf_dem.c	\
+	conf_hlp.c	\
 	init.c		\
 	config.c	\
 	events.c	\
@@ -156,7 +154,7 @@ OBJS =	main.o		\
 	conf_gfx.o	\
 	conf_snd.o	\
 	conf_mus.o	\
-	conf_dem.o	\
+	conf_hlp.o	\
 	init.o		\
 	config.o	\
 	events.o	\
@@ -177,6 +175,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	\