From a17abfa76e9928bbe1c0c5b5bf42f96e95050520 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Mon, 11 May 2009 12:12:56 +0000 Subject: [PATCH] Fix up r1169 a bit, and a few minor changes. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1170 96395faa-99c1-11dd-bbfe-3dabce05a288 --- 3rdparty/SoundTouch/configure.ac | 6 +++--- pcsx2/Makefile.am | 37 ++++++++++++++++++-------------- pcsx2/Mdec.cpp | 4 +++- pcsx2/configure.ac | 17 --------------- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/3rdparty/SoundTouch/configure.ac b/3rdparty/SoundTouch/configure.ac index d7ed878820..73f71cf3d0 100644 --- a/3rdparty/SoundTouch/configure.ac +++ b/3rdparty/SoundTouch/configure.ac @@ -16,9 +16,9 @@ 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 " +CFLAGS+=" -m32 " +CPPFLAGS+=" -m32 " +CXXFLAGS+=" -m32 " CCASFLAGS+=" -m32 " dnl Check for 64bit CPU diff --git a/pcsx2/Makefile.am b/pcsx2/Makefile.am index eb5f646a7a..4a8ef1cf76 100644 --- a/pcsx2/Makefile.am +++ b/pcsx2/Makefile.am @@ -3,25 +3,30 @@ INCLUDES = -I@srcdir@/x86/ -I@srcdir@/../common/include -I@srcdir@/../3rdparty noinst_LIBRARIES = libpcsx2.a libpcsx2_a_SOURCES = \ -CDVD.cpp CDVDiso.cpp CDVDisodrv.cpp COP0.cpp COP2.cpp Cache.cpp CdRom.cpp Console.cpp HwRead.cpp HwWrite.cpp \ -Counters.cpp Decode_XA.cpp Elfheader.cpp FPU.cpp FPU2.cpp FiFo.cpp Gif.cpp GS.cpp Hw.cpp Interpreter.cpp \ -IopBios.cpp IopCounters.cpp IopDma.cpp IopHw.cpp IopMem.cpp IopSio2.cpp MMI.cpp MTGS.cpp \ -Memory.cpp MemoryCard.cpp Misc.cpp Patch.cpp PathUtils.cpp Plugins.cpp PrecompiledHeader.cpp R3000A.cpp \ -R3000AInterpreter.cpp R3000AOpcodeTables.cpp R5900.cpp R5900OpcodeImpl.cpp R5900OpcodeTables.cpp \ -SPR.cpp SaveState.cpp Sif.cpp Sio.cpp SourceLog.cpp Stats.cpp System.cpp ThreadTools.cpp \ -VU0.cpp VU0micro.cpp VU0microInterp.cpp VU1micro.cpp VU1microInterp.cpp VUflags.cpp VUmicroMem.cpp VUops.cpp \ -Vif.cpp VifDma.cpp vssprintf.cpp vtlb.cpp xmlpatchloader.cpp AlignedMalloc.cpp \ -RecoverySystem.cpp Saveslots.cpp Dump.cpp +AlignedMalloc.cpp Decode_XA.cpp HwRead.cpp MTGS.cpp R3000AInterpreter.cpp Sio.cpp VUflags.cpp \ +CDVD.cpp Dump.cpp HwWrite.cpp R3000AOpcodeTables.cpp SourceLog.cpp VUmicroMem.cpp \ +CDVDiso.cpp Elfheader.cpp Interpreter.cpp Memory.cpp R5900.cpp Stats.cpp VUops.cpp \ +CDVDisodrv.cpp FPU.cpp IopBios.cpp MemoryCard.cpp R5900OpcodeImpl.cpp System.cpp Vif.cpp \ +COP0.cpp FPU2.cpp IopCounters.cpp Misc.cpp R5900OpcodeTables.cpp ThreadTools.cpp VifDma.cpp \ +COP2.cpp FiFo.cpp IopDma.cpp Patch.cpp RecoverySystem.cpp VU0.cpp vssprintf.cpp \ +Cache.cpp GS.cpp IopHw.cpp PathUtils.cpp SPR.cpp VU0micro.cpp vtlb.cpp \ +CdRom.cpp Gif.cpp IopMem.cpp Plugins.cpp SaveState.cpp VU0microInterp.cpp xmlpatchloader.cpp \ +Console.cpp IopSio2.cpp PrecompiledHeader.cpp Saveslots.cpp VU1micro.cpp \ +Counters.cpp Hw.cpp MMI.cpp R3000A.cpp Sif.cpp VU1microInterp.cpp +#Mdec.cpp HashTools.cpp -libpcsx2_a_SOURCES += \ + +libpcsx2_a_SOURCES += \ ps2/Iop/IopHwRead.cpp ps2/Iop/IopHwWrite.cpp ps2/Iop/IopHw_Internal.h libpcsx2_a_SOURCES += \ -CDVD.h CDVDiso.h CDVDisodrv.h CDVDlib.h COP0.h Cache.h CdRom.h Common.h Counters.h Decode_XA.h \ -Elfheader.h Exceptions.h GS.h Hw.h IopBios.h IopBios2.h IopCounters.h IopDma.h IopHw.h IopMem.h IopSio2.h Memcpyfast.h \ -Memory.h MemoryTypes.h MemoryCard.h Misc.h Patch.h Paths.h Plugins.h PrecompiledHeader.h IopCommon.h R3000A.h R5900.h R5900OpcodeTables.h \ -SPR.h SamplProf.h SaveState.h Sif.h Sifcmd.h Sio.h SafeArray.h Stats.h StringUtils.h System.h Threading.h \ -VU.h VUflags.h VUmicro.h VUops.h Vif.h VifDma.h cheatscpp.h vtlb.h NakedAsm.h R5900Exceptions.h HostGui.h Pcsx2Config.h \ -Dump.h +CDVD.h Common.h HashMap.h IopDma.h MemoryCard.h PrecompiledHeader.h SafeArray.h StringUtils.h Vif.h \ +CDVDiso.h Counters.h HostGui.h IopHw.h MemoryTypes.h R3000A.h SamplProf.h System.h VifDma.h \ +CDVDisodrv.h Decode_XA.h Hw.h IopMem.h Misc.h R5900.h SaveState.h Threading.h cheatscpp.h \ +CDVDlib.h Dump.h IopBios.h IopSio2.h NakedAsm.h R5900Exceptions.h Sif.h VU.h vtlb.h \ +COP0.h Elfheader.h IopBios2.h Mdec.h Patch.h R5900OpcodeTables.h Sifcmd.h VUflags.h \ +Cache.h Exceptions.h IopCommon.h MemcpyFast.h Paths.h Sio.h VUmicro.h \ +CdRom.h GS.h IopCounters.h Memory.h Plugins.h SPR.h Stats.h VUops.h +#RedtapeWindows.h SUBDIRS = x86 . DebugTools IPU RDebug tinyxml Linux \ No newline at end of file diff --git a/pcsx2/Mdec.cpp b/pcsx2/Mdec.cpp index 8a8f84ddf9..c6b5da470b 100644 --- a/pcsx2/Mdec.cpp +++ b/pcsx2/Mdec.cpp @@ -18,6 +18,8 @@ /* This code was based on the FPSE v0.08 Mdec decoder*/ +#ifdef 0 + #include #include @@ -413,7 +415,7 @@ int SaveState::mdecFreeze() { return 0; } - +#endif diff --git a/pcsx2/configure.ac b/pcsx2/configure.ac index ca5fb7d265..33ef288569 100644 --- a/pcsx2/configure.ac +++ b/pcsx2/configure.ac @@ -7,10 +7,6 @@ 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 @@ -57,31 +53,18 @@ then 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} -m32 " CXXFLAGS+=" ${NORMAL_FLAGS} -fpermissive -Xlinker -zmuldefs -m32 " CCASFLAGS+=" ${NORMAL_FLAGS} -m32 " - #LDFLAGS+=" -m32 " - #ASFLAGS+=" -m32 " MYOBJDIR="Release" fi AC_MSG_RESULT($debug) AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC)) -#AC_MSG_CHECKING(turn on memcpy_fast_) -#AC_ARG_ENABLE(memcpyfast, AC_HELP_STRING([--enable-memcpyfast], [Turns on memcpy_fast - EXPERIMENTAL]), -#memcpyfast=$enableval,memcpyfast=no) -#if test "x$memcpyfast" == xyes -#then -# AC_DEFINE(LINUX_USE_FAST_MEMORY,1,[LINUX_USE_FAST_MEMORY]) -#fi -#AC_MSG_RESULT($memcpyfast) - #AC_MSG_CHECKING(turn on microVU) #AC_ARG_ENABLE(microVU, AC_HELP_STRING([--enable-microVU], [Turns on the currently incomplete microVU files - Not a good idea]), # microVU=$enableval,microVU=no)