[Opende-svn] SF.net SVN: opende: [942] trunk

[<kw...@us...>]

Revision: 942
Author:   kwizatz
Date:     2006-04-28 15:56:18 -0700 (Fri, 28 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=942&view=rev

Log Message:
-----------
More Stuff for MacOSX compilation, added X paths to CFLAGS, CXXFLAGS and LDFLAGS

Modified Paths:
--------------
    trunk/configure.in
    trunk/drawstuff/src/Makefile.am
    trunk/include/ode/common.h
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-04-28 12:09:16 UTC (rev 941)
+++ trunk/configure.in	2006-04-28 22:56:18 UTC (rev 942)
@@ -257,23 +257,38 @@
 
 
 dnl Check for OpenGL
-AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glext.h,,,
-     [[#if HAVE_GL_GL_H
-       #include <GL/gl.h>
-       #endif
-	   #if HAVE_GL_GLU_H
-       #include <GL/glu.h>
-       #endif
-     ]])
-AC_CHECK_LIB(GL, main,[GL_LIBS="$GL_LIBS -lGL"])
-TEMP_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $GL_LIBS"
-AC_CHECK_LIB(GLU, main,[GL_LIBS="$GL_LIBS -lGLU"])
-LDFLAGS="$TEMP_LDFLAGS"
-AC_CHECK_LIB(opengl32, main,[GL_LIBS="$GL_LIBS -lopengl32"])
-AC_CHECK_LIB(glu32, main,[GL_LIBS="$GL_LIBS -lglu32"])
-AC_CHECK_LIB(Xmu, main,[GL_LIBS="$GL_LIBS -lXmu"])
-AC_CHECK_LIB(Xi, main,[GL_LIBS="$GL_LIBS -lXi"])
+AC_ARG_WITH([apple-opengl-framework],
+            [AC_HELP_STRING([--with-apple-opengl-framework],
+                            [use Apple OpenGL framework (Mac OS X only)])])
+if test "X$with_apple_opengl_framework" = "Xyes"; then
+  AC_DEFINE([HAVE_APPLE_OPENGL_FRAMEWORK], [1],
+            [Use the Apple OpenGL framework.])
+  GL_LIBS="-framework OpenGL"
+else
+dnl Add X include and lib paths
+  if test "X$no_x" != "Xyes"; then
+    CXXFLAGS="$CXXFLAGS -I${x_includes}"
+    CFLAGS="$CFLAGS -I${x_includes}"
+    LDFLAGS="$LDFLAGS -L${x_libraries}"
+  fi
+  AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glext.h,,,
+       [[#if HAVE_GL_GL_H
+         #include <GL/gl.h>
+         #endif
+  	   #if HAVE_GL_GLU_H
+         #include <GL/glu.h>
+         #endif
+       ]])
+  AC_CHECK_LIB(GL, main,[GL_LIBS="$GL_LIBS -lGL"])
+  TEMP_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $GL_LIBS"
+  AC_CHECK_LIB(GLU, main,[GL_LIBS="$GL_LIBS -lGLU"])
+  LDFLAGS="$TEMP_LDFLAGS"
+  AC_CHECK_LIB(opengl32, main,[GL_LIBS="$GL_LIBS -lopengl32"])
+  AC_CHECK_LIB(glu32, main,[GL_LIBS="$GL_LIBS -lglu32"])
+  AC_CHECK_LIB(Xmu, main,[GL_LIBS="$GL_LIBS -lXmu"])
+  AC_CHECK_LIB(Xi, main,[GL_LIBS="$GL_LIBS -lXi"])
+fi
 AC_SUBST(GL_LIBS)
 
 dnl Add some Windows libraries if found
@@ -324,7 +339,7 @@
 fi
 
 dnl Check for autoscan sugested functions
-AC_CHECK_FUNCS([floor memmove memset select sqrt sqrtf sinf cosf fabsf atan2f fmodf copysignf copysign snprintf vsnprintf gettimeofday])
+AC_CHECK_FUNCS([floor memmove memset select sqrt sqrtf sinf cosf fabsf atan2f fmodf copysignf copysign snprintf vsnprintf gettimeofday isnan isnanf])
 AC_FUNC_ALLOCA 
 AC_FUNC_MALLOC
 AC_FUNC_OBSTACK 

Modified: trunk/drawstuff/src/Makefile.am
===================================================================
--- trunk/drawstuff/src/Makefile.am	2006-04-28 12:09:16 UTC (rev 941)
+++ trunk/drawstuff/src/Makefile.am	2006-04-28 22:56:18 UTC (rev 942)
@@ -3,11 +3,12 @@
 # drawstuff is meant as an aid for testing and not as a full
 # rendering library.
 
-AM_CXXFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
-
 noinst_LIBRARIES = libdrawstuff.a
 libdrawstuff_a_SOURCES = drawstuff.cpp internal.h
+libdrawstuff_a_CXXFLAGS =  @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
+
+# libdrawstuff_a_LIBADD = @GL_LIBS@
+
 if WIN32
 libdrawstuff_a_SOURCES+= windows.cpp
 endif

Modified: trunk/include/ode/common.h
===================================================================
--- trunk/include/ode/common.h	2006-04-28 12:09:16 UTC (rev 941)
+++ trunk/include/ode/common.h	2006-04-28 22:56:18 UTC (rev 942)
@@ -22,9 +22,9 @@
 
 #ifndef _ODE_COMMON_H_
 #define _ODE_COMMON_H_
-
 #include <ode/config.h>
 #include <ode/error.h>
+#include <math.h>
 
 #ifdef __cplusplus
 extern "C" {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.