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

[<tf...@us...>]

Revision: 907
Author:   tfautre
Date:     2006-04-04 03:17:09 -0700 (Tue, 04 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=907&view=rev

Log Message:
-----------
- made the -fPIC compilation flag only active on X86_64_SYSTEM

Modified Paths:
--------------
    trunk/configure.in
    trunk/ode/src/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-04-04 09:48:17 UTC (rev 906)
+++ trunk/configure.in	2006-04-04 10:17:09 UTC (rev 907)
@@ -226,6 +226,7 @@
 AC_DEFINE(X86_64_SYSTEM,1,[is this a X86_64 system on a gcc-based platform?])
 fi
 AC_MSG_RESULT($cpu64)
+AM_CONDITIONAL(X86_64_SYSTEM, test x$cpu64 = xyes)
 
 AC_MSG_CHECKING(if building a release library)
 AC_ARG_ENABLE(release,AC_HELP_STRING([--enable-release],

Modified: trunk/ode/src/Makefile.am
===================================================================
--- trunk/ode/src/Makefile.am	2006-04-04 09:48:17 UTC (rev 906)
+++ trunk/ode/src/Makefile.am	2006-04-04 10:17:09 UTC (rev 907)
@@ -2,8 +2,12 @@
 AM_CPPFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
 lib_LIBRARIES = libode.a
-libode_a_CPPFLAGS = -O2 -fPIC
+libode_a_CPPFLAGS = -O2
 
+if X86_64_SYSTEM
+libode_a_CPPFLAGS += -fPIC
+endif
+
 # Fake an executable in order to get a shared library
 # Note the elegant and cunning way to trick Autotools to install a program
 # in a lib directory. --Rodrigo
@@ -21,9 +25,13 @@
 
 # convenience library to simulate per object cflags
 noinst_LIBRARIES= libfast.a
-libfast_a_CFLAGS= -O1 -fPIC
+libfast_a_CFLAGS= -O1
 libfast_a_SOURCES= fastldlt.c fastltsolve.c fastdot.c fastlsolve.c
 
+if X86_64_SYSTEM
+libfast_a_CFLAGS += -fPIC
+endif
+
 libode_a_DEPENDENCIES = libfast.a
 libode_a_LIBADD= $(libfast_a_OBJECTS)
 
@@ -79,6 +87,11 @@
 if OPCODE
 noinst_LIBRARIES+= libOPCODE.a
 libOPCODE_a_CPPFLAGS= -O2 -fno-strict-aliasing -fPIC
+
+if X86_64_SYSTEM
+libOPCODE_a_CPPFLAGS += -fPIC
+endif
+
 libOPCODE_a_SOURCES=	@TOPDIR@/OPCODE/OPC_AABBCollider.cpp \
 			@TOPDIR@/OPCODE/OPC_AABBTree.cpp \
 			@TOPDIR@/OPCODE/OPC_BaseModel.cpp \


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