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

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

Revision: 952
Author:   kwizatz
Date:     2006-05-10 14:10:22 -0700 (Wed, 10 May 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=952&view=rev

Log Message:
-----------
Fixed LINK and CC redefinition warnings by moving their definition to configure.in for MacOSX.

Modified Paths:
--------------
    trunk/configure.in
    trunk/ode/src/Makefile.am
    trunk/ode/test/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-05-09 17:45:53 UTC (rev 951)
+++ trunk/configure.in	2006-05-10 21:10:22 UTC (rev 952)
@@ -255,24 +255,60 @@
 AC_CHECK_SIZEOF(long int)
 AC_CHECK_SIZEOF(void*)
 
-dnl Decide which version of the drawstuff library we should build
-AC_MSG_CHECKING(which drawstuff lib to build)
+
 case "$host_os" in
+  hpux9* | hpux10* | hpux11*)  # taken from ltconfig
+    so_ext=".sl"
+    DLLDEFINE=""
+    SHARED_LDFLAGS="-shared"
+    ;;
   cygwin* | mingw*)
+    ;;
+  *apple* | *darwin*) # For Mac OS X
+    ;;
+  *)
+    ;;
+esac
+
+dnl Set some Platform Specific Variables
+case "$host_os" in
+  cygwin* | mingw*)
+    so_ext=".dll"
+    DLLDEFINE="-DODE_DLL"
+    SHARED_LDFLAGS="-shared"
     drawstuff="Win32" # if in a Windows enviroment
     ;;
   *apple* | *darwin*) # For Mac OS X
+    so_ext=".dylib"
+    DLLDEFINE=""
+    SHARED_LDFLAGS="-dynamiclib"
     drawstuff="OSX"
+    dnl We need to use C++ compilation and linking for ode on Mac
+    dnl Might as well do it for all code.
+    CC="$(CXX)"
+    LINK="$(CXXLINK)"
     ;;
   *)
    drawstuff="X11" # if anything else default to X11
+   so_ext=".so"
+    DLLDEFINE=""
+    SHARED_LDFLAGS="-shared"
     ;;
 esac
-AC_MSG_RESULT($drawstuff)
+dnl Set Conditionals
 AM_CONDITIONAL(WIN32, test x$drawstuff = xWin32)
 AM_CONDITIONAL(X11, test x$drawstuff = xX11)
 AM_CONDITIONAL(OSX, test x$drawstuff = xOSX)
+dnl Set Drawstuff variables
+AC_MSG_CHECKING(which drawstuff lib to build)
+AC_MSG_RESULT($drawstuff)
 AC_SUBST(DRAWSTUFF)
+dnl Set shared library variables
+AC_MSG_CHECKING(for the suffix of shared libraries)
+AC_MSG_RESULT($so_ext)
+AC_DEFINE_UNQUOTED(SO_EXT,"$so_ext",[The extension for shared libraries.])
+AC_SUBST(so_ext)
+AC_SUBST(SHARED_LDFLAGS)
 
 dnl Check for OpenGL
 if test "x$drawstuff" = "xOSX"; then
@@ -359,7 +395,7 @@
 #endif
 #if defined(HAVE_IEEEFP_H) && !defined(__CYGWIN__)
 // This header creates conflicts with math.h in Cygwin.
-#include <alloca.h>
+#include <ieeefp.h>
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -432,33 +468,6 @@
 #endif /* #define ODE_CONFIG_H */
 ])
 
-AC_MSG_CHECKING(for the suffix of shared libraries)
-case "$host_os" in
-  hpux9* | hpux10* | hpux11*)  # taken from ltconfig
-    so_ext=".sl"
-    DLLDEFINE=""
-    SHARED_LDFLAGS="-shared"
-    ;;
-  cygwin* | mingw*)
-    so_ext=".dll"
-    DLLDEFINE="-DODE_DLL"
-    SHARED_LDFLAGS="-shared"
-    ;;
-  *apple* | *darwin*) # For Mac OS X
-    so_ext=".dylib"
-    DLLDEFINE=""
-    SHARED_LDFLAGS="-dynamiclib"
-    ;;
-  *)
-   so_ext=".so"
-    DLLDEFINE=""
-    SHARED_LDFLAGS="-shared"
-    ;;
-esac
-AC_MSG_RESULT($so_ext)
-AC_DEFINE_UNQUOTED(SO_EXT,"$so_ext",[The extension for shared libraries.])
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
 
 dnl Finally write our Makefiles
 AC_OUTPUT([

Modified: trunk/ode/src/Makefile.am
===================================================================
--- trunk/ode/src/Makefile.am	2006-05-09 17:45:53 UTC (rev 951)
+++ trunk/ode/src/Makefile.am	2006-05-10 21:10:22 UTC (rev 952)
@@ -4,10 +4,6 @@
 lib_LIBRARIES = libode.a
 libode_a_CPPFLAGS = -O2
 
-if OSX
-LINK=$(CXXLINK)
-endif
-
 if X86_64_SYSTEM
 libode_a_CPPFLAGS += -fPIC
 endif

Modified: trunk/ode/test/Makefile.am
===================================================================
--- trunk/ode/test/Makefile.am	2006-05-09 17:45:53 UTC (rev 951)
+++ trunk/ode/test/Makefile.am	2006-05-10 21:10:22 UTC (rev 952)
@@ -1,11 +1,6 @@
 AM_CXXFLAGS = @ARCHFLAGS@ @CXXFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = @ARCHFLAGS@ @CXXFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
 
-if OSX
-CC=$(CXX)
-LINK=$(CXXLINK)
-endif
-
 noinst_PROGRAMS=test_collision \
 		test_slider \
 		test_crash \


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