diff --git a/3rdparty/SoundTouch/Makefile.am b/3rdparty/SoundTouch/Makefile.am index a09ae5f081..baf08c838f 100644 --- a/3rdparty/SoundTouch/Makefile.am +++ b/3rdparty/SoundTouch/Makefile.am @@ -39,7 +39,8 @@ RateTransposer.cpp SoundTouch.cpp TDStretch.cpp WavFile.cpp cpu_detect_x86_gcc.c # ??? test for -fcheck-new in configure.ac # 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 #libSoundTouch_la_LIBADD= diff --git a/plugins/CDVDiso/src/Linux/Makefile b/plugins/CDVDiso/src/Linux/Makefile index 7893a6548d..8251fa19c1 100644 --- a/plugins/CDVDiso/src/Linux/Makefile +++ b/plugins/CDVDiso/src/Linux/Makefile @@ -9,7 +9,7 @@ OBJS = ../CDVDisop.o Config.o Linux.o ../libiso.o CFGOBJS = conf.o interface.o support.o ${OBJS} LIBS = -lz -lbz2 -lstdc++ 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) all: plugin cfg diff --git a/plugins/CDVDnull/Src/CDVD.c b/plugins/CDVDnull/Src/CDVD.c index b5fcc2166f..c4b3cfa04f 100644 --- a/plugins/CDVDnull/Src/CDVD.c +++ b/plugins/CDVDnull/Src/CDVD.c @@ -2,7 +2,6 @@ #include "CDVD.h" - char *LibName = "CDVDnull Driver"; const unsigned char version = PS2E_CDVD_VERSION; diff --git a/plugins/CDVDnull/Src/Makefile b/plugins/CDVDnull/Src/Makefile index f16d9ace67..d9b83b8a82 100644 --- a/plugins/CDVDnull/Src/Makefile +++ b/plugins/CDVDnull/Src/Makefile @@ -2,7 +2,6 @@ # Makefile for MINGW32 # - all: cdvdnull install: all @@ -23,10 +22,9 @@ RESOBJ = cdvdnull.o OBJS = CDVD.o - 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} # dllwrap --def plugin.def -o ${PLUGIN} ${OBJS} ${LIBS} diff --git a/plugins/FWnull/Linux/Makefile b/plugins/FWnull/Linux/Makefile index a5b50b8dc5..a2f3f21617 100644 --- a/plugins/FWnull/Linux/Makefile +++ b/plugins/FWnull/Linux/Makefile @@ -1,7 +1,7 @@ PLUGIN = libFWnull.so 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+= Linux.o Config.o CFGOBJS = conf.o interface.o support.o Config.o diff --git a/plugins/SPU2null/Src/Makefile b/plugins/SPU2null/Src/Makefile index fc6bebeb31..89c2b357ae 100644 --- a/plugins/SPU2null/Src/Makefile +++ b/plugins/SPU2null/Src/Makefile @@ -2,7 +2,7 @@ CC = gcc 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 DEPS:= $(OBJS:.o=.d) LIBS = $(shell pkg-config --libs gtk+-2.0) diff --git a/plugins/dev9null/src/Makefile b/plugins/dev9null/src/Makefile index 663ab848e0..d0fa8ea301 100644 --- a/plugins/dev9null/src/Makefile +++ b/plugins/dev9null/src/Makefile @@ -2,7 +2,7 @@ CC = gcc 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 DEPS:= $(OBJS:.o=.d) diff --git a/plugins/zerogs/opengl/Makefile.am b/plugins/zerogs/opengl/Makefile.am index f15ca94d3a..c66a43a85b 100644 --- a/plugins/zerogs/opengl/Makefile.am +++ b/plugins/zerogs/opengl/Makefile.am @@ -1,7 +1,7 @@ # Create a shared library libZeroGSogl AUTOMAKE_OPTIONS = foreign 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_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) diff --git a/plugins/zeropad/Makefile.am b/plugins/zeropad/Makefile.am index bb6b8d1c1f..08047050a6 100644 --- a/plugins/zeropad/Makefile.am +++ b/plugins/zeropad/Makefile.am @@ -1,7 +1,7 @@ # Create a shared library libZeroPAD AUTOMAKE_OPTIONS = foreign 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_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) diff --git a/plugins/zerospu2/Makefile.am b/plugins/zerospu2/Makefile.am index 82265b2de5..0444786e0c 100644 --- a/plugins/zerospu2/Makefile.am +++ b/plugins/zerospu2/Makefile.am @@ -1,7 +1,7 @@ # Create a shared library libZeroSPU2 AUTOMAKE_OPTIONS = foreign 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_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) @@ -22,13 +22,13 @@ EXEEXT=$(preext)@so_ext@ traplib_PROGRAMS=libZeroSPU2 libZeroSPU2_SOURCES= -libZeroSPU2_DEPENDENCIES = libZeroSPU2.a 3rdparty/SoundTouch/libSoundTouch.a +libZeroSPU2_DEPENDENCIES = libZeroSPU2.a ../../3rdparty/SoundTouch/libSoundTouch.a libZeroSPU2_LDFLAGS= @SHARED_LDFLAGS@ 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.h reg.h misc.h libZeroSPU2_a_SOURCES += Linux/interface.c Linux/Linux.cpp Linux/Alsa.cpp Linux/OSS.cpp Linux/support.c -SUBDIRS = 3rdparty/SoundTouch +SUBDIRS = ../../3rdparty/SoundTouch diff --git a/plugins/zerospu2/configure.ac b/plugins/zerospu2/configure.ac index a5d0134e16..2181f81c37 100644 --- a/plugins/zerospu2/configure.ac +++ b/plugins/zerospu2/configure.ac @@ -105,7 +105,7 @@ AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"]) AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"]) AC_OUTPUT([ - 3rdparty/SoundTouch/Makefile + ../../3rdparty/SoundTouch/Makefile Makefile ])