rocksndiamonds-3.0.8

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 0512cf8029a2f6a23bdc9091624273c6b5cd8f23..05eccd9916ed18c56496318ab01a9216a5f4c6b0 100644 (file)
--- 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)
@@ -114,7 +112,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
@@ -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        \