mirror of https://github.com/PCSX2/pcsx2.git
Work on pcsx2's Makefiles a bit. Move CDVD*.* and CdRom.* to a separate subdirectory, to make things a bit less cluttered.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1201 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42
parent
d676d2ee44
commit
15821b465a
|
|
@ -0,0 +1,18 @@
|
|||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(x86_dir) -I$(common_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libps2_cdvd.a
|
||||
|
||||
libps2_cdvd_a_SOURCES = \
|
||||
CDVD.cpp CDVDiso.cpp CDVDisodrv.cpp CdRom.cpp \
|
||||
CDVD.h CDVD_internal.h CDVDiso.h CDVDisodrv.h CDVDlib.h CdRom.h
|
||||
|
||||
#SUBDIRS =
|
||||
|
|
@ -1,4 +1,14 @@
|
|||
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(common_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libDebugTools.a
|
||||
|
||||
libDebugTools_a_SOURCES = \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
INCLUDES = -I@srcdir@/../ -I@srcdir@/../x86 -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(x86_dir) -I$(common_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libIPU.a
|
||||
|
||||
libIPU_a_SOURCES = IPU.cpp yuv2rgb.cpp coroutine.cpp \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../ -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(ipu_dir) -I$(top_srcdir) -I$(common_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libmpeg2IPU.a
|
||||
|
||||
libmpeg2IPU_a_SOURCES = Idct.cpp Mpeg.cpp Mpeg.h Vlc.h
|
||||
|
|
@ -1,5 +1,17 @@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
|
||||
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
gtk_includes= $(shell pkg-config --cflags gtk+-2.0)
|
||||
|
||||
INCLUDES = $(gtk_includes) -I$(top_srcdir) -I$(cdvd_dir) -I$(common_dir) -I$(third_dir)
|
||||
|
||||
bin_PROGRAMS = pcsx2
|
||||
|
||||
|
|
@ -14,7 +26,9 @@ pcsx2_LDFLAGS =
|
|||
pcsx2_DEPENDENCIES = ../libpcsx2.a ../IPU/libIPU.a ../IPU/mpeg2lib/libmpeg2IPU.a ../RDebug/libRDebug.a ../tinyxml/libtinyxml.a
|
||||
pcsx2_DEPENDENCIES += ../x86/libx86recomp.a ../x86/ix86/libix86.a
|
||||
pcsx2_DEPENDENCIES += ../DebugTools/libDebugTools.a
|
||||
pcsx2_DEPENDENCIES += ../CDVD/libps2_cdvd.a
|
||||
|
||||
pcsx2_LDADD = ../libpcsx2.a ../IPU/libIPU.a ../IPU/mpeg2lib/libmpeg2IPU.a ../RDebug/libRDebug.a ../tinyxml/libtinyxml.a
|
||||
pcsx2_LDADD += ../x86/libx86recomp.a ../x86/ix86/libix86.a
|
||||
pcsx2_LDADD += ../DebugTools/libDebugTools.a
|
||||
pcsx2_LDADD += ../DebugTools/libDebugTools.a
|
||||
pcsx2_LDADD += ../CDVD/libps2_cdvd.a
|
||||
|
|
@ -1,16 +1,28 @@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
INCLUDES = -I@srcdir@/x86/ -I@srcdir@/../common/include -I@srcdir@/../3rdparty
|
||||
ACLOCAL_AMFLAGS = -I m4 --install
|
||||
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(x86_dir) -I$(cdvd_dir) -I$(common_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libpcsx2.a
|
||||
|
||||
libpcsx2_a_SOURCES = \
|
||||
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 \
|
||||
Dump.cpp HwWrite.cpp R3000AOpcodeTables.cpp SourceLog.cpp VUmicroMem.cpp \
|
||||
Elfheader.cpp Interpreter.cpp Memory.cpp R5900.cpp Stats.cpp VUops.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 \
|
||||
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
|
||||
|
|
@ -20,13 +32,13 @@ libpcsx2_a_SOURCES += \
|
|||
ps2/Iop/IopHwRead.cpp ps2/Iop/IopHwWrite.cpp ps2/Iop/IopHw_Internal.h
|
||||
|
||||
libpcsx2_a_SOURCES += \
|
||||
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 \
|
||||
Common.h HashMap.h IopDma.h MemoryCard.h PrecompiledHeader.h SafeArray.h StringUtils.h Vif.h \
|
||||
Counters.h HostGui.h IopHw.h MemoryTypes.h R3000A.h SamplProf.h System.h VifDma.h \
|
||||
Decode_XA.h Hw.h IopMem.h Misc.h R5900.h SaveState.h Threading.h cheatscpp.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 Sio_internal.h VUmicro.h \
|
||||
CdRom.h GS.h IopCounters.h Memory.h Plugins.h SPR.h Stats.h VUops.h
|
||||
GS.h IopCounters.h Memory.h Plugins.h SPR.h Stats.h VUops.h
|
||||
#RedtapeWindows.h
|
||||
|
||||
SUBDIRS = x86 . DebugTools IPU RDebug tinyxml Linux
|
||||
SUBDIRS = x86 . CDVD DebugTools IPU RDebug tinyxml Linux
|
||||
|
|
@ -1,4 +1,14 @@
|
|||
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(cdvd_dir) -I$(common_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libRDebug.a
|
||||
|
||||
libRDebug_a_SOURCES = \
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ AC_PROG_RANLIB
|
|||
|
||||
dnl necessary for compiling assembly
|
||||
AM_PROG_AS
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
svnrev="`svn info | grep Revision:`"
|
||||
|
||||
|
|
@ -110,6 +111,7 @@ fi
|
|||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
CDVD/Makefile
|
||||
DebugTools/Makefile
|
||||
Linux/Makefile
|
||||
IPU/Makefile
|
||||
|
|
@ -132,3 +134,4 @@ echo " local plugin inis? $localinis"
|
|||
echo " custom cflags? $customcflags"
|
||||
echo " memcpy_fast? $memcpyfast"
|
||||
#echo " microVU? $microVU"
|
||||
echo " pcsx2_dir = '$pcsx2_dir'"
|
||||
|
|
|
|||
|
|
@ -1449,23 +1449,23 @@
|
|||
Name="Iop"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\CdRom.cpp"
|
||||
RelativePath="..\..\CDVD\CdRom.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CdRom.h"
|
||||
RelativePath="..\..\CDVD\CdRom.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CDVD.cpp"
|
||||
RelativePath="..\..\CDVD\CDVD.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CDVD.h"
|
||||
RelativePath="..\..\CDVD\CDVD.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CDVD_internal.h"
|
||||
RelativePath="..\..\CDVD\CDVD_internal.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -2390,19 +2390,19 @@
|
|||
Name="FileSystems"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\CDVDiso.cpp"
|
||||
RelativePath="..\..\CDVD\CDVDiso.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CDVDiso.h"
|
||||
RelativePath="..\..\CDVD\CDVDiso.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CDVDisodrv.cpp"
|
||||
RelativePath="..\..\CDVD\CDVDisodrv.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\CDVDisodrv.h"
|
||||
RelativePath="..\..\CDVD\CDVDisodrv.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../IPU/ -I@srcdir@/../../3rdparty
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(common_dir) -I$(ipu_dir) -I$(cdvd_dir) -I$(third_dir)
|
||||
noinst_LIBRARIES = libx86recomp.a
|
||||
|
||||
# have to add the sources instead of making a library since the linking is complicated
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
INCLUDES = -I@srcdir@/.. -I@srcdir@/../../ -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty -I/implement -I/implement/xmm
|
||||
pcsx2_dir = $(top_srcdir)/..
|
||||
common_dir = $(pcsx2_dir)/common/include
|
||||
third_dir = $(pcsx2_dir)/3rdparty
|
||||
cdvd_dir = $(top_srcdir)/CDVD
|
||||
x86_dir = $(top_srcdir)/x86
|
||||
rdebug_dir = $(top_srcdir)/RDebug
|
||||
debugtools_dir = $(top_srcdir)/DebugTools
|
||||
ipu_dir = $(top_srcdir)/IPU
|
||||
linux_dir = $(top_srcdir)/Linux
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(x86_dir) -I$(cdvd_dir) -I$(common_dir) -I$(third_dir) -I/implement -I/implement/xmm
|
||||
noinst_LIBRARIES = libix86.a
|
||||
|
||||
libix86_a_SOURCES = \
|
||||
|
|
|
|||
Loading…
Reference in New Issue