From: Holger Schemel <info@artsoft.org>
Date: Thu, 4 Mar 2004 08:35:22 +0000 (+0100)
Subject: rnd-20040304-1-src
X-Git-Tag: 3.1.0^2~57
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=4130cb786738fca2739bfc5cd13b185ba7df24bb;p=rocksndiamonds.git

rnd-20040304-1-src
* fixed bug with missing error handling when dumping levels or tapes
---

diff --git a/ChangeLog b/ChangeLog
index 122286cf..dda04e0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-03
+	* fixed bug with missing error handling when dumping levels or tapes
+
 2004-03-02
 	* added different colored editor graphics for Supaplex gravity tubes
 
diff --git a/Makefile b/Makefile
index 1ea92b07..481244f7 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = x11
-# DEFAULT_TARGET = sdl
+# DEFAULT_TARGET = x11
+DEFAULT_TARGET = sdl
 
 
 # -----------------------------------------------------------------------------
diff --git a/src/Makefile b/src/Makefile
index ef1f52af..f065f0b9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -85,8 +85,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)
diff --git a/src/conftime.h b/src/conftime.h
index c6f7f77c..351eac2b 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-03-03 18:10]"
+#define COMPILE_DATE_STRING "[2004-03-03 23:39]"