ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Get most of the plugins to build. ZeroSPU2 is being stubborn... 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@597 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-02-25 12:30:10 +00:00
parent b50b9df3cf
commit 47bda29d23
11 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/SoundTouch/Makefile.am vendored
View File

@ -39,7 +39,8 @@ RateTransposer.cpp SoundTouch.cpp TDStretch.cpp WavFile.cpp cpu_detect_x86_gcc.c
# ??? test for -fcheck-new in configure.ac # ??? test for -fcheck-new in configure.ac
# other compiler flags to add # other compiler flags to add
AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include AM_CXXFLAGS=-O3 -msse -fcheck-new
#-I../../include
# other linking flags to add # other linking flags to add
#libSoundTouch_la_LIBADD= #libSoundTouch_la_LIBADD=

2
plugins/CDVDiso/src/Linux/Makefile
View File

@ -9,7 +9,7 @@ OBJS = ../CDVDisop.o Config.o Linux.o ../libiso.o
CFGOBJS = conf.o interface.o support.o ${OBJS} CFGOBJS = conf.o interface.o support.o ${OBJS}
LIBS = -lz -lbz2 -lstdc++ LIBS = -lz -lbz2 -lstdc++
CFGLIBS = $(shell pkg-config --libs gtk+-2.0) ${LIBS} CFGLIBS = $(shell pkg-config --libs gtk+-2.0) ${LIBS}
CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -I../common CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -I../../../../common/include -I../../../../3rdparty
DEPS:= $(OBJS:.o=.d) $(CFGOBJS:.o=.d) DEPS:= $(OBJS:.o=.d) $(CFGOBJS:.o=.d)
all: plugin cfg all: plugin cfg

1
plugins/CDVDnull/Src/CDVD.c
View File

@ -2,7 +2,6 @@
#include "CDVD.h" #include "CDVD.h"
char *LibName = "CDVDnull Driver"; char *LibName = "CDVDnull Driver";
const unsigned char version = PS2E_CDVD_VERSION; const unsigned char version = PS2E_CDVD_VERSION;

4
plugins/CDVDnull/Src/Makefile
View File

@ -2,7 +2,6 @@
# Makefile for MINGW32 # Makefile for MINGW32
# #
all: cdvdnull all: cdvdnull
install: all install: all
@ -23,10 +22,9 @@ RESOBJ = cdvdnull.o
OBJS = CDVD.o OBJS = CDVD.o
DEPS:= $(OBJS:.o=.d) DEPS:= $(OBJS:.o=.d)
CFLAGS = -Wall ${OPTIMIZE} -I. -I/usr/local/include ${FLAGS} -fPIC CFLAGS = -Wall ${OPTIMIZE} -I../../../common/include -I. -I/usr/local/include ${FLAGS} -fPIC
cdvdnull: ${OBJS} cdvdnull: ${OBJS}
# dllwrap --def plugin.def -o ${PLUGIN} ${OBJS} ${LIBS} # dllwrap --def plugin.def -o ${PLUGIN} ${OBJS} ${LIBS}

2
plugins/FWnull/Linux/Makefile
View File

@ -1,7 +1,7 @@
PLUGIN = libFWnull.so PLUGIN = libFWnull.so
CFG = cfgFWnull CFG = cfgFWnull
CFLAGS+= -fPIC -Wall -I. -I.. -O3 -fomit-frame-pointer -fno-strict-aliasing CFLAGS+= -fPIC -Wall -I. -I.. -I../../../common/include -O3 -fomit-frame-pointer -fno-strict-aliasing
OBJS = ../FW.o OBJS = ../FW.o
OBJS+= Linux.o Config.o OBJS+= Linux.o Config.o
CFGOBJS = conf.o interface.o support.o Config.o CFGOBJS = conf.o interface.o support.o Config.o

2
plugins/SPU2null/Src/Makefile
View File

@ -2,7 +2,7 @@
CC = gcc CC = gcc
PLUGIN = libSPU2null.so PLUGIN = libSPU2null.so
CFLAGS+= -fPIC -Wall -O2 -fomit-frame-pointer -D__LINUX__ CFLAGS+= -fPIC -Wall -O2 -fomit-frame-pointer -D__LINUX__ -I../../../common/include
OBJS = SPU2.o OBJS = SPU2.o
DEPS:= $(OBJS:.o=.d) DEPS:= $(OBJS:.o=.d)
LIBS = $(shell pkg-config --libs gtk+-2.0) LIBS = $(shell pkg-config --libs gtk+-2.0)

2
plugins/dev9null/src/Makefile
View File

@ -2,7 +2,7 @@
CC = gcc CC = gcc
PLUGIN = libDEV9null.so PLUGIN = libDEV9null.so
CFLAGS+= -fPIC -Wall -O2 -fomit-frame-pointer -D__LINUX__ CFLAGS+= -fPIC -Wall -O2 -fomit-frame-pointer -D__LINUX__ -I../../../common/include
OBJS = dev9null.o OBJS = dev9null.o
DEPS:= $(OBJS:.o=.d) DEPS:= $(OBJS:.o=.d)

2
plugins/zerogs/opengl/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libZeroGSogl # Create a shared library libZeroGSogl
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libZeroGSogl.a noinst_LIBRARIES = libZeroGSogl.a
INCLUDES = -I@srcdir@/common -I@srcdir@/3rdparty INCLUDES = -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty
libZeroGSogl_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroGSogl_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libZeroGSogl_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroGSogl_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)

2
plugins/zeropad/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libZeroPAD # Create a shared library libZeroPAD
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libZeroPAD.a noinst_LIBRARIES = libZeroPAD.a
INCLUDES = -I@srcdir@/common INCLUDES = -I@srcdir@/../../common/include
libZeroPAD_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroPAD_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libZeroPAD_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroPAD_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)

8
plugins/zerospu2/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libZeroSPU2 # Create a shared library libZeroSPU2
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libZeroSPU2.a noinst_LIBRARIES = libZeroSPU2.a
INCLUDES = -I@srcdir@/common -I@srcdir@/3rdparty INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
libZeroSPU2_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroSPU2_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libZeroSPU2_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroSPU2_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
@ -22,13 +22,13 @@ EXEEXT=$(preext)@so_ext@
traplib_PROGRAMS=libZeroSPU2 traplib_PROGRAMS=libZeroSPU2
libZeroSPU2_SOURCES= libZeroSPU2_SOURCES=
libZeroSPU2_DEPENDENCIES = libZeroSPU2.a 3rdparty/SoundTouch/libSoundTouch.a libZeroSPU2_DEPENDENCIES = libZeroSPU2.a ../../3rdparty/SoundTouch/libSoundTouch.a
libZeroSPU2_LDFLAGS= @SHARED_LDFLAGS@ libZeroSPU2_LDFLAGS= @SHARED_LDFLAGS@
libZeroSPU2_LDFLAGS+=-Wl,-soname,@ZEROSPU2_SONAME@ libZeroSPU2_LDFLAGS+=-Wl,-soname,@ZEROSPU2_SONAME@
libZeroSPU2_LDADD=$(libZeroSPU2_a_OBJECTS) 3rdparty/SoundTouch/libSoundTouch.a libZeroSPU2_LDADD=$(libZeroSPU2_a_OBJECTS) ../../3rdparty/SoundTouch/libSoundTouch.a
libZeroSPU2_a_SOURCES = zerospu2.cpp voices.cpp zerodma.cpp libZeroSPU2_a_SOURCES = zerospu2.cpp voices.cpp zerodma.cpp
libZeroSPU2_a_SOURCES += zerospu2.h reg.h misc.h libZeroSPU2_a_SOURCES += zerospu2.h reg.h misc.h
libZeroSPU2_a_SOURCES += Linux/interface.c Linux/Linux.cpp Linux/Alsa.cpp Linux/OSS.cpp Linux/support.c libZeroSPU2_a_SOURCES += Linux/interface.c Linux/Linux.cpp Linux/Alsa.cpp Linux/OSS.cpp Linux/support.c
SUBDIRS = 3rdparty/SoundTouch SUBDIRS = ../../3rdparty/SoundTouch

2
plugins/zerospu2/configure.ac
View File

@ -105,7 +105,7 @@ AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"])
AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"]) AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"])
AC_OUTPUT([ AC_OUTPUT([
3rdparty/SoundTouch/Makefile ../../3rdparty/SoundTouch/Makefile
Makefile Makefile
]) ])