From 6083e3a64335d6b9f5064658c50b29095a2eb24a Mon Sep 17 00:00:00 2001 From: arcum42 Date: Mon, 11 May 2009 10:44:12 +0000 Subject: [PATCH] Linux: Add -m32 to the compiler flags of pcsx2 and all plugins. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1169 96395faa-99c1-11dd-bbfe-3dabce05a288 --- 3rdparty/SoundTouch/configure.ac | 10 ++++++++++ build.sh | 4 ++-- pcsx2/configure.ac | 19 ++++++++++++++----- plugins/CDVDiso/src/configure.ac | 15 +++++++++------ plugins/CDVDisoEFP/src/Linux/Makefile | 4 ++-- plugins/CDVDlinuz/Src/Linux/Makefile | 4 ++-- plugins/CDVDnull/configure.ac | 15 +++++++++------ plugins/FWnull/configure.ac | 15 +++++++++------ plugins/GSnull/configure.ac | 15 +++++++++------ plugins/PeopsSPU2/Makefile | 8 ++++---- plugins/SPU2null/configure.ac | 15 +++++++++------ plugins/USBnull/configure.ac | 15 +++++++++------ plugins/dev9null/configure.ac | 15 +++++++++------ plugins/spu2-x/src/configure.ac | 15 +++++++++------ plugins/zerogs/opengl/configure | 15 +++++++++------ plugins/zerogs/opengl/configure.ac | 15 +++++++++------ plugins/zeropad/configure.ac | 11 +++++++---- plugins/zerospu2/configure.ac | 15 +++++++++------ 18 files changed, 140 insertions(+), 85 deletions(-) diff --git a/3rdparty/SoundTouch/configure.ac b/3rdparty/SoundTouch/configure.ac index 6ee3f30f64..d7ed878820 100644 --- a/3rdparty/SoundTouch/configure.ac +++ b/3rdparty/SoundTouch/configure.ac @@ -11,6 +11,16 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_RANLIB +CFLAGS= +CPPFLAGS= +CXXFLAGS= +CCASFLAGS= + +CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " +CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " +CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " +CCASFLAGS+=" -m32 " + dnl Check for 64bit CPU AC_MSG_CHECKING(for a x86-64 CPU) dnl if test "$build_os" == "target_os" diff --git a/build.sh b/build.sh index a6aaa8710d..94bc4c8acd 100644 --- a/build.sh +++ b/build.sh @@ -28,7 +28,7 @@ export PCSX2PLUGINS="`pwd`/bin/plugins" curdir=`pwd` echo "Building the Pcsx2 Suite." -echo "Note: will not compile on Linux x64." +echo "Note: binaries generated are 32 bit, and require 32 bit versions of all dependencies." cd ${curdir}/plugins sh build.sh $option @@ -39,7 +39,7 @@ exit 1 fi echo "Building Pcsx2." -echo "Note: will not compile on Linux x64." +echo "Note: binaries generated are 32 bit, and require 32 bit versions of all dependencies." cd ${curdir}/pcsx2 sh build.sh $option diff --git a/pcsx2/configure.ac b/pcsx2/configure.ac index 449e023f95..ca5fb7d265 100644 --- a/pcsx2/configure.ac +++ b/pcsx2/configure.ac @@ -7,6 +7,10 @@ AC_PROG_CPP([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) AC_PROG_RANLIB +#AS="$CC" +#AC_SUBST(AS) +#AC_SUBST(ASFLAGS) + dnl necessary for compiling assembly AM_PROG_AS @@ -50,14 +54,19 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]), if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+=" ${DEBUG_FLAGS} -Xlinker -zmuldefs " - CXXFLAGS+=" ${DEBUG_FLAGS} -fpermissive -Xlinker -zmuldefs " - CCASFLAGS+=" -D_DEBUG ${DEBUG_FLAGS} " + CFLAGS+=" ${DEBUG_FLAGS} -Xlinker -zmuldefs -m32 " + CXXFLAGS+=" ${DEBUG_FLAGS} -fpermissive -Xlinker -zmuldefs -m32 " + CCASFLAGS+=" -D_DEBUG ${DEBUG_FLAGS} -m32 " + #LDFLAGS+=" -m32 " + #ASFLAGS+=" -m32 " MYOBJDIR="Debug" else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+=" ${NORMAL_FLAGS}" - CXXFLAGS+=" ${NORMAL_FLAGS} -fpermissive -Xlinker -zmuldefs " + CFLAGS+=" ${NORMAL_FLAGS} -m32 " + CXXFLAGS+=" ${NORMAL_FLAGS} -fpermissive -Xlinker -zmuldefs -m32 " + CCASFLAGS+=" ${NORMAL_FLAGS} -m32 " + #LDFLAGS+=" -m32 " + #ASFLAGS+=" -m32 " MYOBJDIR="Release" fi AC_MSG_RESULT($debug) diff --git a/plugins/CDVDiso/src/configure.ac b/plugins/CDVDiso/src/configure.ac index b181d19477..d42c8b2865 100755 --- a/plugins/CDVDiso/src/configure.ac +++ b/plugins/CDVDiso/src/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(CDVDiso_SONAME,libCDVDiso.so.[$CDVDiso_CURRENT].[$CDVDiso_REVISION].[$C CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+=" -g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+=" -g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+=" -g -fPIC -Wall -Wno-unused-value -fpermissive " + CFLAGS+=" -g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+=" -g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+=" -g -fPIC -Wall -Wno-unused-value -fpermissive -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value " - CPPFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value " - CXXFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -fpermissive " + CFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -m32 " + CPPFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -m32 " + CXXFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -fpermissive -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/CDVDisoEFP/src/Linux/Makefile b/plugins/CDVDisoEFP/src/Linux/Makefile index 1fee325f34..4f1bf81b83 100644 --- a/plugins/CDVDisoEFP/src/Linux/Makefile +++ b/plugins/CDVDisoEFP/src/Linux/Makefile @@ -3,7 +3,7 @@ PLUGIN = libCDVDisoEFP.so PLUGINOBJS = CDVDiso.o PLUGINHEADERS = CDVDiso.h PLUGINFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -D_LARGEFILE64_SOURCE \ - -I.. -I. -I./Linux + -I.. -I. -I./Linux -m32 PLUGINLIBS = -lz -lbz2 CFG = cfgCDVDisoEFP @@ -14,7 +14,7 @@ CFGHEADERS = interface.h aboutbox.h mainbox.h selectionbox.h \ devicebox.h conversionbox.h progressbox.h messagebox.h \ tablerebuild.h device.h CD.h DVD.h CFGFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -D_LARGEFILE64_SOURCE \ - -I.. -I. -I./Linux + -I.. -I. -I./Linux -m32 CFGLIBS = -lz -lbz2 COMP = compCDVDisoEFP diff --git a/plugins/CDVDlinuz/Src/Linux/Makefile b/plugins/CDVDlinuz/Src/Linux/Makefile index be45567df9..a3525a8be4 100644 --- a/plugins/CDVDlinuz/Src/Linux/Makefile +++ b/plugins/CDVDlinuz/Src/Linux/Makefile @@ -3,14 +3,14 @@ PLUGIN = libCDVDlinuz.so PLUGINOBJS = CDVDlinuz.o ../buffer.o PLUGINHEADERS = CDVDlinuz.h ../buffer.h PLUGINFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -D_LARGEFILE64_SOURCE \ - -I.. -I. -I./Linux + -I.. -I. -I./Linux -m32 PLUGINLIBS = CFG = cfgCDVDlinuz CFGOBJS = aboutbox.o mainbox.o interface.o CFGHEADERS = aboutbox.h mainbox.h interface.h CFGFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -D_LARGEFILE64_SOURCE \ - -I.. -I. -I./Linux + -I.. -I. -I./Linux -m32 CFGLIBS = SHAREDOBJS = actualfile.o conf.o logfile.o \ diff --git a/plugins/CDVDnull/configure.ac b/plugins/CDVDnull/configure.ac index 0ef1c2ae4c..9075e3be14 100644 --- a/plugins/CDVDnull/configure.ac +++ b/plugins/CDVDnull/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(CDVDnull_SONAME,libCDVDnull.so.[$CDVDnull_CURRENT].[$CDVDnull_REVISION] CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/FWnull/configure.ac b/plugins/FWnull/configure.ac index c0f2fe3358..8171e574a4 100644 --- a/plugins/FWnull/configure.ac +++ b/plugins/FWnull/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(FWnull_SONAME,libFWnull.so.[$FWnull_CURRENT].[$FWnull_REVISION].[$FWnul CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/GSnull/configure.ac b/plugins/GSnull/configure.ac index 09f8e74eed..8973091c0e 100644 --- a/plugins/GSnull/configure.ac +++ b/plugins/GSnull/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(GSnull_SONAME,libGSnull.so.[$GSnull_CURRENT].[$GSnull_REVISION].[$GSnul CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/PeopsSPU2/Makefile b/plugins/PeopsSPU2/Makefile index 685c267710..c620587c0c 100644 --- a/plugins/PeopsSPU2/Makefile +++ b/plugins/PeopsSPU2/Makefile @@ -16,9 +16,9 @@ NOTHREADLIB = FALSE ############################################################################## CC = gcc -CCFLAGS1 = -fPIC -c -Wall -O3 -CCFLAGS2 = -fPIC -c -Wall -O2 -ffast-math -CCFLAGS3 = -fPIC -c -Wall -O3 -ffast-math -fomit-frame-pointer +CCFLAGS1 = -fPIC -c -Wall -O3 -m32 +CCFLAGS2 = -fPIC -c -Wall -O2 -ffast-math -m32 +CCFLAGS3 = -fPIC -c -Wall -O3 -ffast-math -fomit-frame-pointer -m32 INCLUDE = LINK = gcc @@ -32,7 +32,7 @@ ifeq ($(USEALSA), TRUE) CCFLAGS3+= -DUSEALSA else OBJ+= oss.o - LINKFLAGS = -shared -Wl,-soname,libspu2PeopsOSS.so.1.6 -fPIC -fomit-frame-pointer -o libspu2PeopsOSS.so.1.6 + LINKFLAGS = -shared -Wl,-soname,libspu2PeopsOSS.so.1.6 -fPIC -fomit-frame-pointer -o libspu2PeopsOSS.so.1.6 -m32 endif ifeq ($(NOTHREADLIB), TRUE) diff --git a/plugins/SPU2null/configure.ac b/plugins/SPU2null/configure.ac index 2cc0ffb87d..cee047ebe0 100644 --- a/plugins/SPU2null/configure.ac +++ b/plugins/SPU2null/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(SPU2null_SONAME,libSPU2null.so.[$SPU2null_CURRENT].[$SPU2null_REVISION] CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/USBnull/configure.ac b/plugins/USBnull/configure.ac index 4a5de1dc8d..a2177049ab 100644 --- a/plugins/USBnull/configure.ac +++ b/plugins/USBnull/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(USBnull_SONAME,libUSBnull.so.[$USBnull_CURRENT].[$USBnull_REVISION].[$U CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/dev9null/configure.ac b/plugins/dev9null/configure.ac index a14ec42970..7b9d8dbaef 100644 --- a/plugins/dev9null/configure.ac +++ b/plugins/dev9null/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(DEV9null_SONAME,libDEV9null.so.[$DEV9null_CURRENT].[$DEV9null_REVISION] CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/spu2-x/src/configure.ac b/plugins/spu2-x/src/configure.ac index eb2596fcef..37d1dd2f14 100644 --- a/plugins/spu2-x/src/configure.ac +++ b/plugins/spu2-x/src/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(SPU2X_SONAME,libSPU2X.so.[$SPU2X_CURRENT].[$SPU2X_REVISION].[$SPU2X_AGE CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/zerogs/opengl/configure b/plugins/zerogs/opengl/configure index 8650685df9..c0c7bb22fe 100644 --- a/plugins/zerogs/opengl/configure +++ b/plugins/zerogs/opengl/configure @@ -4428,6 +4428,7 @@ ZEROGS_SONAME=libZeroGSogl.so.$ZEROGS_CURRENT.$ZEROGS_REVISION.$ZEROGS_AGE CFLAGS=" -I/opt/cg/include -L/opt/cg/lib " CPPFLAGS=" -I/opt/cg/include -L/opt/cg/lib " CXXFLAGS=" -I/opt/cg/include -L/opt/cg/lib " +CCASFLAGS= { $as_echo "$as_me:$LINENO: checking debug build" >&5 $as_echo_n "checking debug build... " >&6; } @@ -4445,18 +4446,20 @@ cat >>confdefs.h <<\_ACEOF #define _DEBUG 1 _ACEOF - CFLAGS+="-g " - CPPFLAGS+="-g " - CXXFLAGS+="-g -fpermissive " + CFLAGS+="-g -m32 " + CPPFLAGS+="-g -m32 " + CXXFLAGS+="-g -fpermissive -m32 " + CCASFLAGS+=" -m32 " else cat >>confdefs.h <<\_ACEOF #define NDEBUG 1 _ACEOF - CFLAGS+="-O3 -fomit-frame-pointer " - CPPFLAGS+="-O3 -fomit-frame-pointer " - CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive " + CFLAGS+="-O3 -fomit-frame-pointer -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive -m32 " + CCASFLAGS+=" -m32 " fi { $as_echo "$as_me:$LINENO: result: $debug" >&5 $as_echo "$debug" >&6; } diff --git a/plugins/zerogs/opengl/configure.ac b/plugins/zerogs/opengl/configure.ac index b602230a08..040f6f7de5 100644 --- a/plugins/zerogs/opengl/configure.ac +++ b/plugins/zerogs/opengl/configure.ac @@ -22,6 +22,7 @@ AC_SUBST(ZEROGS_SONAME, libZeroGSogl.so.[$ZEROGS_CURRENT].[$ZEROGS_REVISION].[$Z CFLAGS=" -I/opt/cg/include -L/opt/cg/lib " CPPFLAGS=" -I/opt/cg/include -L/opt/cg/lib " CXXFLAGS=" -I/opt/cg/include -L/opt/cg/lib " +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -30,14 +31,16 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]), if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g " - CPPFLAGS+="-g " - CXXFLAGS+="-g -fpermissive " + CFLAGS+="-g -m32 " + CPPFLAGS+="-g -m32 " + CXXFLAGS+="-g -fpermissive -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer " - CPPFLAGS+="-O3 -fomit-frame-pointer " - CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive " + CFLAGS+="-O3 -fomit-frame-pointer -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive -m32 " + CCASFLAGS+=" -m32 " fi AC_MSG_RESULT($debug) diff --git a/plugins/zeropad/configure.ac b/plugins/zeropad/configure.ac index f8e9a86fea..95b38496c2 100644 --- a/plugins/zeropad/configure.ac +++ b/plugins/zeropad/configure.ac @@ -20,6 +20,7 @@ AC_SUBST(ZEROPAD_SONAME, libZeroPAD.so.[$ZEROPAD_CURRENT].[$ZEROPAD_REVISION].[$ CFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -28,12 +29,14 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]), if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g " - CXXFLAGS+="-g " + CFLAGS+="-g -m32 " + CXXFLAGS+="-g -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O2 -fomit-frame-pointer " - CXXFLAGS+="-O2 -fomit-frame-pointer " + CFLAGS+="-O2 -fomit-frame-pointer -m32 " + CXXFLAGS+="-O2 -fomit-frame-pointer -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug) diff --git a/plugins/zerospu2/configure.ac b/plugins/zerospu2/configure.ac index bebc95f237..b0b2ce69cb 100644 --- a/plugins/zerospu2/configure.ac +++ b/plugins/zerospu2/configure.ac @@ -21,6 +21,7 @@ AC_SUBST(ZEROSPU2_SONAME, libZeroSPU2.so.[$ZEROSPU2_CURRENT].[$ZEROSPU2_REVISION CFLAGS= CPPFLAGS= CXXFLAGS= +CCASFLAGS= dnl Check for debug build AC_MSG_CHECKING(debug build) @@ -29,14 +30,16 @@ debug=$enableval,debug=no) if test "x$debug" == xyes then AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value " + CFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-g -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " else AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " - CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value " + CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall -Wno-unused-value -m32 " + CCASFLAGS+=" -m32 " fi AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes) AC_MSG_RESULT($debug)