From 15821b465a24faaae9f8e0d8271059b42e2889cc Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 16 May 2009 04:26:10 +0000 Subject: [PATCH] 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 --- pcsx2/{ => CDVD}/CDVD.cpp | 0 pcsx2/{ => CDVD}/CDVD.h | 0 pcsx2/{ => CDVD}/CDVD_internal.h | 0 pcsx2/{ => CDVD}/CDVDiso.cpp | 0 pcsx2/{ => CDVD}/CDVDiso.h | 0 pcsx2/{ => CDVD}/CDVDisodrv.cpp | 0 pcsx2/{ => CDVD}/CDVDisodrv.h | 0 pcsx2/{ => CDVD}/CDVDlib.h | 0 pcsx2/{ => CDVD}/CdRom.cpp | 0 pcsx2/{ => CDVD}/CdRom.h | 0 pcsx2/CDVD/Makefile.am | 18 ++++++++++++ pcsx2/DebugTools/Makefile.am | 12 +++++++- pcsx2/IPU/Makefile.am | 12 +++++++- pcsx2/IPU/mpeg2lib/Makefile.am | 12 +++++++- pcsx2/Linux/Makefile.am | 18 ++++++++++-- pcsx2/Makefile.am | 34 +++++++++++++++------- pcsx2/RDebug/Makefile.am | 12 +++++++- pcsx2/configure.ac | 3 ++ pcsx2/windows/VCprojects/pcsx2_2008.vcproj | 18 ++++++------ pcsx2/x86/Makefile.am | 12 +++++++- pcsx2/x86/ix86/Makefile.am | 12 +++++++- 21 files changed, 135 insertions(+), 28 deletions(-) rename pcsx2/{ => CDVD}/CDVD.cpp (100%) rename pcsx2/{ => CDVD}/CDVD.h (100%) rename pcsx2/{ => CDVD}/CDVD_internal.h (100%) rename pcsx2/{ => CDVD}/CDVDiso.cpp (100%) rename pcsx2/{ => CDVD}/CDVDiso.h (100%) rename pcsx2/{ => CDVD}/CDVDisodrv.cpp (100%) rename pcsx2/{ => CDVD}/CDVDisodrv.h (100%) rename pcsx2/{ => CDVD}/CDVDlib.h (100%) rename pcsx2/{ => CDVD}/CdRom.cpp (100%) rename pcsx2/{ => CDVD}/CdRom.h (100%) create mode 100644 pcsx2/CDVD/Makefile.am diff --git a/pcsx2/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp similarity index 100% rename from pcsx2/CDVD.cpp rename to pcsx2/CDVD/CDVD.cpp diff --git a/pcsx2/CDVD.h b/pcsx2/CDVD/CDVD.h similarity index 100% rename from pcsx2/CDVD.h rename to pcsx2/CDVD/CDVD.h diff --git a/pcsx2/CDVD_internal.h b/pcsx2/CDVD/CDVD_internal.h similarity index 100% rename from pcsx2/CDVD_internal.h rename to pcsx2/CDVD/CDVD_internal.h diff --git a/pcsx2/CDVDiso.cpp b/pcsx2/CDVD/CDVDiso.cpp similarity index 100% rename from pcsx2/CDVDiso.cpp rename to pcsx2/CDVD/CDVDiso.cpp diff --git a/pcsx2/CDVDiso.h b/pcsx2/CDVD/CDVDiso.h similarity index 100% rename from pcsx2/CDVDiso.h rename to pcsx2/CDVD/CDVDiso.h diff --git a/pcsx2/CDVDisodrv.cpp b/pcsx2/CDVD/CDVDisodrv.cpp similarity index 100% rename from pcsx2/CDVDisodrv.cpp rename to pcsx2/CDVD/CDVDisodrv.cpp diff --git a/pcsx2/CDVDisodrv.h b/pcsx2/CDVD/CDVDisodrv.h similarity index 100% rename from pcsx2/CDVDisodrv.h rename to pcsx2/CDVD/CDVDisodrv.h diff --git a/pcsx2/CDVDlib.h b/pcsx2/CDVD/CDVDlib.h similarity index 100% rename from pcsx2/CDVDlib.h rename to pcsx2/CDVD/CDVDlib.h diff --git a/pcsx2/CdRom.cpp b/pcsx2/CDVD/CdRom.cpp similarity index 100% rename from pcsx2/CdRom.cpp rename to pcsx2/CDVD/CdRom.cpp diff --git a/pcsx2/CdRom.h b/pcsx2/CDVD/CdRom.h similarity index 100% rename from pcsx2/CdRom.h rename to pcsx2/CDVD/CdRom.h diff --git a/pcsx2/CDVD/Makefile.am b/pcsx2/CDVD/Makefile.am new file mode 100644 index 0000000000..be2de4296b --- /dev/null +++ b/pcsx2/CDVD/Makefile.am @@ -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 = \ No newline at end of file diff --git a/pcsx2/DebugTools/Makefile.am b/pcsx2/DebugTools/Makefile.am index 24e7e0bf18..fe0dc8ab59 100644 --- a/pcsx2/DebugTools/Makefile.am +++ b/pcsx2/DebugTools/Makefile.am @@ -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 = \ diff --git a/pcsx2/IPU/Makefile.am b/pcsx2/IPU/Makefile.am index c6ba0fd177..3a6a835956 100644 --- a/pcsx2/IPU/Makefile.am +++ b/pcsx2/IPU/Makefile.am @@ -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 \ diff --git a/pcsx2/IPU/mpeg2lib/Makefile.am b/pcsx2/IPU/mpeg2lib/Makefile.am index 84af02e631..ca369bdc59 100644 --- a/pcsx2/IPU/mpeg2lib/Makefile.am +++ b/pcsx2/IPU/mpeg2lib/Makefile.am @@ -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 \ No newline at end of file diff --git a/pcsx2/Linux/Makefile.am b/pcsx2/Linux/Makefile.am index 28de7eb964..c9c9dae65a 100644 --- a/pcsx2/Linux/Makefile.am +++ b/pcsx2/Linux/Makefile.am @@ -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 \ No newline at end of file +pcsx2_LDADD += ../DebugTools/libDebugTools.a +pcsx2_LDADD += ../CDVD/libps2_cdvd.a \ No newline at end of file diff --git a/pcsx2/Makefile.am b/pcsx2/Makefile.am index 8de7b044d6..8b666ac2bd 100644 --- a/pcsx2/Makefile.am +++ b/pcsx2/Makefile.am @@ -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 \ No newline at end of file +SUBDIRS = x86 . CDVD DebugTools IPU RDebug tinyxml Linux \ No newline at end of file diff --git a/pcsx2/RDebug/Makefile.am b/pcsx2/RDebug/Makefile.am index 80878c894d..8b67f3ed4b 100644 --- a/pcsx2/RDebug/Makefile.am +++ b/pcsx2/RDebug/Makefile.am @@ -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 = \ diff --git a/pcsx2/configure.ac b/pcsx2/configure.ac index 33ef288569..417bf5e948 100644 --- a/pcsx2/configure.ac +++ b/pcsx2/configure.ac @@ -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'" diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj index 3ccacd31e2..fa733283cd 100644 --- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj +++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj @@ -1449,23 +1449,23 @@ Name="Iop" >