diff --git a/pcsx2/DebugTools/Makefile.am b/pcsx2/DebugTools/Makefile.am index 8d6763ce0c..01f0130ddf 100644 --- a/pcsx2/DebugTools/Makefile.am +++ b/pcsx2/DebugTools/Makefile.am @@ -2,6 +2,6 @@ INCLUDES = -I@srcdir@/../ noinst_LIBRARIES = libDebugTools.a libDebugTools_a_SOURCES = \ -cpuopsDebug.c Debug.h.bak DisR3000asm.c DisVU0Micro.c DisVUops.h \ -cpuopsDebug.h DisASM.h DisR5900asm.c DisVU1Micro.c \ -Debug.h DisR3000A.c DisR5900.c DisVUmicro.h +cpuopsDebug.cpp Debug.h.bak DisR3000asm.cpp DisVU0Micro.cpp DisVUops.h \ +cpuopsDebug.h DisASM.h DisR5900asm.cpp DisVU1Micro.cpp \ +Debug.h DisR3000A.cpp DisR5900.cpp DisVUmicro.h diff --git a/pcsx2/IPU/Makefile.am b/pcsx2/IPU/Makefile.am index e76e41620e..d73e82510f 100644 --- a/pcsx2/IPU/Makefile.am +++ b/pcsx2/IPU/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I@srcdir@/../ -I@srcdir@/../x86 noinst_LIBRARIES = libIPU.a -libIPU_a_SOURCES = IPU.c yuv2rgb.c coroutine.c acoroutine.S +libIPU_a_SOURCES = IPU.c yuv2rgb.cpp coroutine.cpp acoroutine.S SUBDIRS = mpeg2lib diff --git a/pcsx2/IPU/mpeg2lib/Makefile.am b/pcsx2/IPU/mpeg2lib/Makefile.am index 93e7a871d8..146fbf1895 100644 --- a/pcsx2/IPU/mpeg2lib/Makefile.am +++ b/pcsx2/IPU/mpeg2lib/Makefile.am @@ -1,4 +1,4 @@ INCLUDES = -I@srcdir@/../ -I@srcdir@/../../ noinst_LIBRARIES = libmpeg2IPU.a -libmpeg2IPU_a_SOURCES = Idct.c Mpeg.c Mpeg.h Vlc.h \ No newline at end of file +libmpeg2IPU_a_SOURCES = Idct.cpp Mpeg.cpp Mpeg.h Vlc.h \ No newline at end of file diff --git a/pcsx2/Linux/ConfigDlg.h b/pcsx2/Linux/ConfigDlg.h index e01baf55c0..6ce4c91fd2 100644 --- a/pcsx2/Linux/ConfigDlg.h +++ b/pcsx2/Linux/ConfigDlg.h @@ -20,17 +20,17 @@ #define __CONFIGDLG_H__ #include "Linux.h" -//#ifdef __cplusplus -//extern "C" { -//#endif +#ifdef __cplusplus +extern "C" { +#endif #include "support.h" #include "callbacks.h" #include "interface.h" -//#ifdef __cplusplus -//} -//#endif +#ifdef __cplusplus +} +#endif #include "R3000A.h" #include "PsxMem.h" diff --git a/pcsx2/Linux/DebugDlg.h b/pcsx2/Linux/DebugDlg.h index f38f510f12..4595c93903 100644 --- a/pcsx2/Linux/DebugDlg.h +++ b/pcsx2/Linux/DebugDlg.h @@ -20,17 +20,17 @@ #define __DEBUGDLG_H__ #include "Linux.h" -//#ifdef __cplusplus -//extern "C" { -//#endif +#ifdef __cplusplus +extern "C" { +#endif #include "support.h" #include "callbacks.h" #include "interface.h" -//#ifdef __cplusplus -//} -//#endif +#ifdef __cplusplus +} +#endif #include "R3000A.h" #include "PsxMem.h" diff --git a/pcsx2/Linux/GtkGui.h b/pcsx2/Linux/GtkGui.h index 200e953097..e5e2952b30 100644 --- a/pcsx2/Linux/GtkGui.h +++ b/pcsx2/Linux/GtkGui.h @@ -20,17 +20,17 @@ #define __GTKGUI_H__ #include "Linux.h" -//#ifdef __cplusplus -//extern "C" { -//#endif +#ifdef __cplusplus +extern "C" { +#endif #include "support.h" #include "callbacks.h" #include "interface.h" -//#ifdef __cplusplus -//} -//#endif +#ifdef __cplusplus +} +#endif #include "R3000A.h" #include "PsxMem.h" diff --git a/pcsx2/Linux/interface.cpp b/pcsx2/Linux/interface.c similarity index 100% rename from pcsx2/Linux/interface.cpp rename to pcsx2/Linux/interface.c diff --git a/pcsx2/Linux/support.cpp b/pcsx2/Linux/support.c similarity index 100% rename from pcsx2/Linux/support.cpp rename to pcsx2/Linux/support.c diff --git a/pcsx2/Makefile.am b/pcsx2/Makefile.am index 10337b32d6..bfd4535b3d 100644 --- a/pcsx2/Makefile.am +++ b/pcsx2/Makefile.am @@ -3,21 +3,21 @@ INCLUDES = -I@srcdir@/x86/ noinst_LIBRARIES = libpcsx2.a libpcsx2_a_SOURCES = \ -CdRom.c Decode_XA.h Mdec.h PsxBios.h R3000A.c Vif.h \ -CdRom.h EEregs.h PsxCommon.h R3000A.h VU0.c \ -CDVD.c Elfheader.c Memory.c PsxCounters.c R5900.c VU0.h \ -CDVD.h Elfheader.h Memory.h PsxCounters.h R5900.h VU0micro.c \ -CDVDiso.c FiFo.c Misc.c PsxDma.c Sif.c VU1micro.c \ -CDVDisodrv.c FPU2.cpp PsxDma.h Sifcmd.h VUflags.c \ -CDVDisodrv.h FPU.c MMI.c Sif.h VUflags.h \ -CDVDiso.h GS.cpp PathUtils.c Patch.c Sio.c VU.h \ -CDVDlib.h GS.h Patch.h PsxHw.c Sio.h VUmicro.h \ -Common.h Hw.c Plugins.c PsxHw.h SPR.c VUops.c \ -COP0.c Hw.h Plugins.h PsxInterpreter.c SPR.h VUops.h \ -COP0.h Interpreter.c PS2Edefs.h PsxMem.c System.h \ -Counters.c InterTables.c PS2Etypes.h PsxMem.h Vif.c \ -Counters.h InterTables.h PsxBios2.h PsxSio2.c VifDma.c \ -Decode_XA.c PsxBios.c PsxSio2.h VifDma.h Cache.c vtlb.cpp\ +CdRom.cpp Decode_XA.h Mdec.h PsxBios.h R3000A.cpp Vif.h \ +CdRom.h EEregs.h PsxCommon.h R3000A.h VU0.cpp \ +CDVD.cpp Elfheader.cpp Memory.cpp PsxCounters.cpp R5900.cpp VU0.h \ +CDVD.h Elfheader.h Memory.h PsxCounters.h R5900.h VU0micro.cpp \ +CDVDiso.cpp FiFo.cpp Misc.cpp PsxDma.cpp Sif.cpp VU1micro.cpp \ +CDVDisodrv.cpp FPU2.cpp PsxDma.h Sifcmd.h VUflags.cpp \ +CDVDisodrv.h FPU.cpp MMI.cpp Sif.h VUflags.h \ +CDVDiso.h GS.cpp PathUtils.cpp Patch.cpp Sio.cpp VU.h \ +CDVDlib.h GS.h Patch.h PsxHw.cpp Sio.h VUmicro.h \ +Common.h Hw.cpp Plugins.cpp PsxHw.h SPR.cpp VUops.cpp \ +COP0.cpp Hw.h Plugins.h PsxInterpreter.cpp SPR.h VUops.h \ +COP0.h Interpreter.cpp PS2Edefs.h PsxMem.cpp System.h \ +Counters.cpp InterTables.cpp PS2Etypes.h PsxMem.h Vif.cpp \ +Counters.h InterTables.h PsxBios2.h PsxSio2.cpp VifDma.cpp \ +Decode_XA.cpp PsxBios.cpp PsxSio2.h VifDma.h Cache.cpp vtlb.cpp \ xmlpatchloader.cpp ThreadTools.cpp SourceLog.cpp SaveState.cpp SUBDIRS = x86 . DebugTools IPU RDebug tinyxml Linux \ No newline at end of file diff --git a/pcsx2/RDebug/Makefile.am b/pcsx2/RDebug/Makefile.am index 80aa6b0f2e..ead84e4e2a 100644 --- a/pcsx2/RDebug/Makefile.am +++ b/pcsx2/RDebug/Makefile.am @@ -2,6 +2,6 @@ INCLUDES = -I@srcdir@/../ noinst_LIBRARIES = libRDebug.a libRDebug_a_SOURCES = \ -deci2.c deci2_dcmp.c deci2_drfp.h deci2_iloadp.h deci2_ttyp.c \ -deci2_dbgp.c deci2_dcmp.h deci2.h deci2_netmp.c deci2_ttyp.h \ -deci2_dbgp.h deci2_iloadp.c deci2_netmp.h \ No newline at end of file +deci2.cpp deci2_dcmp.cpp deci2_drfp.h deci2_iloadp.h deci2_ttyp.cpp \ +deci2_dbgp.cpp deci2_dcmp.h deci2.h deci2_netmp.cpp deci2_ttyp.h \ +deci2_dbgp.h deci2_iloadp.cpp deci2_netmp.h \ No newline at end of file diff --git a/pcsx2/configure.ac b/pcsx2/configure.ac index 915c47da78..af4d9cd9f3 100644 --- a/pcsx2/configure.ac +++ b/pcsx2/configure.ac @@ -1,9 +1,9 @@ AC_INIT(pcsx2,0.9.5,zerofrog@gmail.com) AM_INIT_AUTOMAKE(pcsx2,0.9.5) -AC_PROG_CC([g++ gcc cl KCC CC cxx cc++ xlC aCC c++]) -AC_PROG_CXX([g++ gcc cl KCC CC cxx cc++ xlC aCC c++]) -AC_PROG_CPP([g++ gcc cl KCC CC cxx cc++ xlC aCC c++]) +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_RANLIB diff --git a/pcsx2/x86/Makefile.am b/pcsx2/x86/Makefile.am index 926f778c14..9aa824100a 100644 --- a/pcsx2/x86/Makefile.am +++ b/pcsx2/x86/Makefile.am @@ -3,17 +3,17 @@ noinst_LIBRARIES = libx86recomp.a # have to add the sources instead of making a library since the linking is complicated if X86_64 -archfiles = ix86-64/iR5900-64.c ix86-64/iR5900AritImm-64.c ix86-64/iR5900Jump-64.c \ -ix86-64/iR5900Move-64.c ix86-64/iR5900Shift-64.c ix86-64/iR5900Arit-64.c ix86-64/iR5900Branch-64.c \ -ix86-64/iR5900LoadStore-64.c ix86-64/iR5900MultDiv-64.c ix86-64/iCore-64.cpp ix86-64/aR5900-64.S +archfiles = ix86-64/iR5900-64.cpp ix86-64/iR5900AritImm-64.cpp ix86-64/iR5900Jump-64.cpp \ +ix86-64/iR5900Move-64.cpp ix86-64/iR5900Shift-64.cpp ix86-64/iR5900Arit-64.cpp ix86-64/iR5900Branch-64.cpp \ +ix86-64/iR5900LoadStore-64.cpp ix86-64/iR5900MultDiv-64.cpp ix86-64/iCore-64.cpp ix86-64/aR5900-64.S else -archfiles = ix86-32/iR5900-32.c ix86-32/iR5900AritImm.c ix86-32/iR5900Jump.c \ -ix86-32/iR5900Move.c ix86-32/iR5900Shift.c ix86-32/iR5900Arit.c ix86-32/iR5900Branch.c \ -ix86-32/iR5900LoadStore.c ix86-32/iR5900MultDiv.c ix86-32/iCore-32.cpp ix86-32/aR5900-32.S +archfiles = ix86-32/iR5900-32.cpp ix86-32/iR5900AritImm.cpp ix86-32/iR5900Jump.cpp \ +ix86-32/iR5900Move.cpp ix86-32/iR5900Shift.cpp ix86-32/iR5900Arit.cpp ix86-32/iR5900Branch.cpp \ +ix86-32/iR5900LoadStore.cpp ix86-32/iR5900MultDiv.cpp ix86-32/iCore-32.cpp ix86-32/aR5900-32.S endif -libx86recomp_a_SOURCES = iCOP2.c iCP0.c iFPU.c iHw.c iMMI.c iPsxHw.c iPsxMem.c \ -ir5900tables.c iVU0micro.c iVU1micro.c iVUmicro.cpp iVUmicroUpper.cpp iVUmicroLower.cpp \ +libx86recomp_a_SOURCES = iCOP2.cpp iCP0.cpp iFPU.cpp iHw.cpp iMMI.cpp iPsxHw.cpp iPsxMem.cpp \ +ir5900tables.cpp iVU0micro.cpp iVU1micro.cpp iVUmicro.cpp iVUmicroUpper.cpp iVUmicroLower.cpp \ iCore.cpp iGS.cpp iR3000A.cpp iR3000Atables.cpp iVif.cpp iVUzerorec.cpp \ fast_routines.S aR3000A.S aVUzerorec.S aVif.S $(archfiles) diff --git a/pcsx2/x86/ix86/Makefile.am b/pcsx2/x86/ix86/Makefile.am index b54ef7af0b..57320a83d3 100644 --- a/pcsx2/x86/ix86/Makefile.am +++ b/pcsx2/x86/ix86/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I@srcdir@/.. -I@srcdir@/../../ noinst_LIBRARIES = libix86.a -libix86_a_SOURCES = ix86_3dnow.c ix86.c ix86_cpudetect.c ix86_fpu.c ix86.h ix86_sse.c +libix86_a_SOURCES = ix86_3dnow.cpp ix86.cpp ix86_cpudetect.cpp ix86_fpu.cpp ix86.h ix86_sse.cpp if X86_64 else -libix86_a_SOURCES += ix86_mmx.c +libix86_a_SOURCES += ix86_mmx.cpp endif