native Framework support on Mac OS X

1 files changed, 90 insertions, 40 deletions

diff --git a/configure.in b/configure.in
index e4f6aff..1b3c803 100644
--- a/configure.in
+++ b/configure.in
@@ -77,28 +77,51 @@ dnl
 
 AC_MSG_CHECKING([host type])
 case "$host" in
+	*-apple-darwin*)
+		HOST_LIBS="-lz"
+		HOST_GL_LIBS="-framework OpenGL"
+		HOST_AL_LIBS="-framework OpenAL"
+		HOST_SDL_LIBS="-framework SDL -framework Cocoa"
+		ICON_CLIENT=""
+		ICON_SERVER=""
+		SDLMAIN="SDLMain.o"
+		INSTALLTYPE="application bundle"
+		OS=OSX
+                AC_MSG_RESULT(OS X)
+		AC_DEFINE_UNQUOTED(_OSX, 1, [Define this if you're building for native OS X])
+		AC_PROG_OBJC
+		;;
+		
         *-*-mingw*)
                 HOST_LIBS="-lws2_32 -lz"
-                HOST_GL_LIBS="-lopengl32 -lglu32"
+                HOST_GL_LIBS="-lopengl32"
 		HOST_AL_LIBS="-lopenal32"
 		ICON_CLIENT="osirion-res.o"
 		ICON_SERVER="osiriond-res.o"
+		SDLMAIN=""
 		INSTALLTYPE="single directory"
+		OS=WIN32
                 AC_MSG_RESULT(win32)
                 ;;
         *)
                 HOST_LIBS="-lz"
-                HOST_GL_LIBS="-lGL -lGLU"
+                HOST_GL_LIBS="-lGL"
 		HOST_AL_LIBS="-lopenal"
 		ICON_CLIENT=""
 		ICON_SERVER=""
+		SDLMAIN=""
 		INSTALLTYPE="standard"
                 AC_MSG_RESULT(generic unix)
+		OS=UNIX
                 ;;
 esac
+AC_SUBST(OS)
 AC_SUBST(HOST_LIBS)
 AC_SUBST(ICON_CLIENT)
 AC_SUBST(ICON_SERVER)
+AC_SUBST(SDLMAIN)
+
+AC_DEFINE(OS, $OS, [Operating System])
 
 dnl ----------------------------------------------------------------
 dnl enable compiler warnings or not
@@ -220,33 +243,48 @@ if test "x${with_client}" = xno; then
 else
 	AC_MSG_RESULT(yes)
 
+	LDFLAGS_save="$LDFLAGS"
+
 	dnl ---------------------------------------------------------------
 	dnl OpenGL
 	dnl
 	
-	AC_CHECK_HEADER(GL/gl.h,
-		[],
-		[AC_MSG_ERROR([GL/gl.h not found])]
-	)
-	
-	AC_CHECK_HEADER(GL/glu.h,
-		[],
-		[AC_MSG_ERROR([GL/glu.h not found])]
-	)
+	if test "x${OS}" = "xOSX"; then
+		AC_CHECK_HEADER(OpenGL/gl.h,
+			[],
+			[AC_MSG_ERROR([OpenGL/gl.h not found])]
+		)
+	else
+		AC_CHECK_HEADER(GL/gl.h,
+			[],
+			[AC_MSG_ERROR([GL/gl.h not found])]
+		)
+	fi
 	
+	LD_FLAGS="$LDFLAGS_save"
 	GL_LIBS="$HOST_GL_LIBS"
 	AC_SUBST(GL_LIBS)
 	AC_SUBST(GL_CFLAGS)
 
 	dnl ---------------------------------------------------------------
 	dnl OpenAL
-
-	AC_CHECK_HEADER(AL/al.h,
-		[],
-		[AC_MSG_ERROR([AL/al.h not found])]
-	)
+	
+	if test "x${OS}" = "xOSX"; then
+		AC_CHECK_HEADER(OpenAL/al.h,
+			[],
+			[AC_MSG_ERROR([OpenAL/al.h not found])]
+		)
+	else
+		AC_CHECK_HEADER(AL/al.h,
+			[],
+			[AC_MSG_ERROR([AL/al.h not found])]
+		)
+	fi
+	
+	LD_FLAGS="$LDFLAGS_save"
 	AL_LIBS="$HOST_AL_LIBS"
 	AC_SUBST(AL_LIBS)
+	AC_SUBST(AL_CFLAGS)
 	
 	dnl ---------------------------------------------------------------
 	dnl libpng
@@ -284,31 +322,43 @@ else
 	dnl SDL
 	dnl
 
-	AC_MSG_CHECKING([looking for SDL])
-	KDE_FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-		AC_MSG_ERROR([SDL not found])
-	])
-	
-	if test -n "$LIBSDL_CONFIG"; then
-		LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`"
-		LIBSDL_RPATH=
-		for args in $LIBSDL_LIBS; do
-		case $args in
-			-L*)
-			LIBSDL_RPATH="$LIBSDL_RPATH $args"
-			;;
-		esac
-		done
-	
-		LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"`
-		LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`"
+	if test "x${OS}" = "xOSX"; then
+		AC_CHECK_HEADER(SDL/SDL.h,
+			[],
+			[AC_MSG_ERROR([SDL/SDL.h not found])]
+		)
+		
+		LIBSDL_LIBS="$HOST_SDL_LIBS"
+		LIBSDL_CFLAGS="$HOST_SDL_LIBS"
+		AC_SUBST(LIBSDL_LIBS)
+		AC_SUBST(LIBSDL_CFLAGS)		
+	else
+		AC_MSG_CHECKING([looking for SDL])
+		KDE_FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+			AC_MSG_ERROR([SDL not found])
+		])
+		
+		if test -n "$LIBSDL_CONFIG"; then
+			LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`"
+			LIBSDL_RPATH=
+			for args in $LIBSDL_LIBS; do
+			case $args in
+				-L*)
+				LIBSDL_RPATH="$LIBSDL_RPATH $args"
+				;;
+			esac
+			done
+		
+			LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"`
+			LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`"
+		fi
+		
+		AC_MSG_RESULT($HAVE_LIBSDL)
+		
+		AC_SUBST(LIBSDL_LIBS)
+		AC_SUBST(LIBSDL_CFLAGS)
+		AC_SUBST(LIBSDL_RPATH)
 	fi
-	
-	AC_MSG_RESULT($HAVE_LIBSDL)
-	
-	AC_SUBST(LIBSDL_LIBS)
-	AC_SUBST(LIBSDL_CFLAGS)
-	AC_SUBST(LIBSDL_RPATH)
 
 	BUILD_CLIENT=yes
 	AC_DEFINE_UNQUOTED(BUILD_CLIENT, 1, [Define this to build the client])