rnd-20031205-B-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index f4ffbc8a9894fe9e3a3b173c229236f81276a41c..0512cf8029a2f6a23bdc9091624273c6b5cd8f23 100644 (file)
--- 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,7 +138,7 @@ SRCS =      main.c          \
        conf_gfx.c      \
        conf_snd.c      \
        conf_mus.c      \
-       conf_inf.c      \
+       conf_dem.c      \
        init.c          \
        config.c        \
        events.c        \
@@ -154,7 +156,7 @@ OBJS =      main.o          \
        conf_gfx.o      \
        conf_snd.o      \
        conf_mus.o      \
-       conf_inf.o      \
+       conf_dem.o      \
        init.o          \
        config.o        \
        events.o        \