From 75da1d2affb71d947aad420ebcc2be3e271b2fc7 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Wed, 30 Apr 2003 20:03:46 +0000
Subject: [PATCH] fix linking bug, increment version number

---
 ChangeLog    | 5 +++++
 Makefile.am  | 8 ++++++--
 NEWS         | 3 +++
 README       | 5 -----
 configure.ac | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f29f969..16041038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+0.2.3:
+
 2003-04-30  Bradley Bell  <btb@icculus.org>
 
+	* Makefile.am, NEWS, README, configure.ac: fix linking bug,
+	increment version number
+
 	* main/Makefile.am: make dist fix
 
 0.2.2:
diff --git a/Makefile.am b/Makefile.am
index 4b4f1d0d..611597cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,11 @@ EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-svga d2x-ggi
 ARCH_LIBS = $(foreach subdir,${D2X_ARCH_SUBDIRS},arch/${subdir}/libarch_${subdir}.a)
 
 if MINGW32
-LD_KLUDGE = main/inferno.o
+AM_LDFLAGS = -all_load
+endif
+
+if MACOSX
+AM_LDFLAGS = -all_load
 endif
 
 if EDITOR
@@ -22,7 +26,7 @@ d2x_gl_SOURCES =
 d2x_svga_SOURCES =
 d2x_ggi_SOURCES =
 
-d2x_LDADD = ${LD_KLUDGE} main/libmain.a ${EDITOR_LIBS} 3d/lib3d.a 2d/lib2d.a ${ARCH_LIBS} libmve/libmve.a mem/libmem.a cfile/libcfile.a iff/libiff.a texmap/libtexmap.a misc/libmisc.a maths/libmaths.a
+d2x_LDADD = main/libmain.a ${EDITOR_LIBS} 3d/lib3d.a 2d/lib2d.a ${ARCH_LIBS} libmve/libmve.a mem/libmem.a cfile/libcfile.a iff/libiff.a texmap/libtexmap.a misc/libmisc.a maths/libmaths.a
 
 if MINGW32
 if USE_NETWORK
diff --git a/NEWS b/NEWS
index fb17f862..78d62ad0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+--- Version 0.2.3 ---
+- Fix linking bug on OS X
+
 --- Version 0.2.2 ---
 - Support for OS X 10.2 added
 
diff --git a/README b/README
index 2e0baa20..46ca5552 100644
--- a/README
+++ b/README
@@ -130,11 +130,6 @@ Compile and install SDL from source: d2x doesn't use Project Builder.
 
 configure and compile as with other unices.
 
-The final linking will probably fail (because of circular
-dependencies, I think) Until I fix it or find a better workaround,
-I've just been linking by hand (i.e. gcc [...] -o d2x-sdl `find
-. -name "*.o"` [...])
-
 Known bugs/issues:
 * Serial and network support missing
 * GL version very buggy
diff --git a/configure.ac b/configure.ac
index 28e671bd..d842bb28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 
 define([D2X_MAJOR],0)
 define([D2X_MINOR],2)
-define([D2X_MICRO],2)
+define([D2X_MICRO],3)
 
 AC_INIT(d2x,[D2X_MAJOR.D2X_MINOR.D2X_MICRO],[descent-source@warpcore.org])
 AC_PREREQ(2.52)
-- 
2.39.2