From 0918cb42a3231af980665478ef963f6c7c36bc69 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 6 May 2010 09:46:48 +0000 Subject: [PATCH] Spu2-x: May as well delete the automake files for spu2-x, as they never worked... (The only way you can build spu2-x in Linux right now is codeblocks.) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2957 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/spu2-x/src/Makefile.am | 41 ---------------- plugins/spu2-x/src/build.sh | 44 ----------------- plugins/spu2-x/src/configure.ac | 87 --------------------------------- 3 files changed, 172 deletions(-) delete mode 100644 plugins/spu2-x/src/Makefile.am delete mode 100644 plugins/spu2-x/src/build.sh delete mode 100644 plugins/spu2-x/src/configure.ac diff --git a/plugins/spu2-x/src/Makefile.am b/plugins/spu2-x/src/Makefile.am deleted file mode 100644 index ffd70c5832..0000000000 --- a/plugins/spu2-x/src/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# Create a shared library libSPU2X -AUTOMAKE_OPTIONS = foreign -noinst_LIBRARIES = libSPU2X.a -INCLUDES = -I@srcdir@/../../../common/include -I@srcdir@/3rdparty -I@srcdir@/../../../3rdparty -I@srcdir@/Linux - -libSPU2X_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) -liconv -libSPU2X_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -liconv - -# Create a shared object by faking an exe (thanks to ODE makefiles) -traplibdir=$(prefix) - -if DEBUGBUILD -preext=d -endif - -EXEEXT=$(preext)@so_ext@ - -traplib_PROGRAMS=libSPU2X -libSPU2X_SOURCES= -libSPU2X_DEPENDENCIES = libSPU2X.a libSoundTouch.a -libSPU2X_LDFLAGS= @SHARED_LDFLAGS@ -libSPU2X_LDFLAGS+=-Wl,-soname,@SPU2X_SONAME@ -libSPU2X_LDADD=$(libSPU2X_a_OBJECTS) libSoundTouch.a - -libSPU2X_a_SOURCES = ADSR.cpp DllInterface.cpp Mixer.cpp RegTable.cpp SaveStateSPU.cpp ConvertUTF.cpp \ -Spu2.cpp Timestretcher.cpp utf8.cpp Debug.cpp Decoder.cpp \ -Dma.cpp Lowpass.cpp RegLog.cpp Reverb.cpp SndOut.cpp Spu2replay.cpp Wavedump_wav.cpp ReadInput.cpp - -libSPU2X_a_SOURCES += BaseTypes.h Debug.h Dma.h Lowpass.h RegTable.h SndOut.h ConvertUTF.h \ -Spu2.h Spu2replay.h defs.h regs.h spdif.h utf8.h - -libSPU2X_a_SOURCES += Linux/Config.h Linux/Config.cpp Linux/Linux.h Linux/Alsa.cpp Linux/Alsa.h \ -Linux/Dialogs.cpp Linux/Dialogs.h Linux/ConfigSoundTouch.cpp - -libSPU2X_a_SOURCES += 3rdparty/liba52/bitstream.c 3rdparty/liba52/downmix.c 3rdparty/liba52/parse.c \ -3rdparty/liba52/bit_allocate.c 3rdparty/liba52/imdct.c \ -3rdparty/liba52/a52.h 3rdparty/liba52/attributes.h 3rdparty/liba52/config.h 3rdparty/liba52/inttypes.h \ -3rdparty/liba52/tendra.h 3rdparty/liba52/a52_internal.h 3rdparty/liba52/bitstream.h \ -3rdparty/liba52/mm_accel.h 3rdparty/liba52/tables.h - -#SUBDIRS = 3rdparty/SoundTouch diff --git a/plugins/spu2-x/src/build.sh b/plugins/spu2-x/src/build.sh deleted file mode 100644 index e53f769d7e..0000000000 --- a/plugins/spu2-x/src/build.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -curdir=`pwd` - -echo -echo SPU2-X is Windows only. Aborting. -if [ 1 == 0 ] -then -if [ $# -gt 0 ] && [ $1 = "all" ] -then - -cd ../../../3rdparty/SoundTouch/ -sh build.sh $@ -cd $curdir - -rm libSoundTouch.a -cp ../../../3rdparty/SoundTouch/libSoundTouch.a ./ - -echo -echo ----------------- -echo Building SPU2-X -echo ----------------- - -if test "${SPU2XOPTIONS+set}" != set ; then -export SPU2XOPTIONS="" -fi - -aclocal -automake -a -autoconf -./configure ${SPU2XOPTIONS} --prefix=${PCSX2PLUGINS} -make clean -make install - -else -make $@ -fi - -if [ $? -ne 0 ] -then -exit 1 -fi -fi -#cp libSPU2X*.so* ${PCSX2PLUGINS} diff --git a/plugins/spu2-x/src/configure.ac b/plugins/spu2-x/src/configure.ac deleted file mode 100644 index edb2e34e3a..0000000000 --- a/plugins/spu2-x/src/configure.ac +++ /dev/null @@ -1,87 +0,0 @@ -AC_INIT(SPU2X, 0.1,Jake.Stine@gmail.com) - -AM_INIT_AUTOMAKE(SPU2X,0.1) - -AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) -AC_PROG_CXX([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) -AC_PROG_CPP([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) - -AC_PROG_INSTALL -AC_PROG_RANLIB - -dnl necessary for compiling assembly -AM_PROG_AS - -AC_SUBST(SPU2X_CURRENT, 0) -AC_SUBST(SPU2X_REVISION, 1) -AC_SUBST(SPU2X_AGE, 0) -AC_SUBST(SPU2X_RELEASE,[$SPU2X_CURRENT].[$SPU2X_REVISION].[$SPU2X_AGE]) -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) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]), -debug=$enableval,debug=no) -if test "x$debug" == xyes -then - AC_DEFINE(PCSX2_DEBUG,1,[PCSX2_DEBUG]) - 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 -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) - -AC_DEFINE(__LINUX__,1,[__LINUX__]) - -dnl Check for dev build -AC_MSG_CHECKING(for development build...) -AC_ARG_ENABLE(devbuild, AC_HELP_STRING([--enable-devbuild], [Special Build for developers that simplifies testing and adds extra checks]), - devbuild=$enableval,devbuild=no) -if test "x$devbuild" == xyes -then - AC_DEFINE(SPU2X_DEVBUILD,1,[SPU2X_DEVBUILD]) -fi -AC_MSG_RESULT($devbuild) -AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno) - -AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC)) - -dnl gtk -AC_MSG_CHECKING(gtk2+) -AC_CHECK_PROG(GTK_CONFIG, pkg-config, pkg-config) -LIBS+=$(pkg-config --libs gtk+-2.0) - -dnl bindir = pcsx2exe - -dnl assuming linux environment -so_ext=".so.$SPU2X_RELEASE" -SHARED_LDFLAGS="-shared" -AC_SUBST(so_ext) -AC_SUBST(SHARED_LDFLAGS) - -AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"]) -AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"]) -AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"]) -AC_CHECK_LIB(iconv,main,[LIBS="$LIBS -liconv"]) -AC_CHECK_FUNCS(iconv, [ have_iconv="1" ], [ have_iconv="0" ]) - -AC_OUTPUT([ - Makefile - ]) - -echo "Configuration:" -echo " Debug build? $debug" -echo " Dev build? $devbuild" \ No newline at end of file