diff --git a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj index b57caac66..3ee04b2c2 100644 --- a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj @@ -756,6 +756,7 @@ AB46781714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns */; }; AB46781814ABD4890002FF94 /* AppIcon_ROMSave.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780814ABD4890002FF94 /* AppIcon_ROMSave.icns */; }; AB46781914ABD4890002FF94 /* AppIcon_SaveState.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780914ABD4890002FF94 /* AppIcon_SaveState.icns */; }; + AB4F981716C30117000E90EA /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD2E135B8ACE00E977B3 /* OGLRender.cpp */; }; AB73B12B14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */; }; AB73B12C14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12A14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm */; }; AB73B12D14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */; }; @@ -896,35 +897,6 @@ ABF50BC9169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; }; ABF50BCA169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; ABF50BCB169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; - ABF50BCC169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; }; - ABF50BCD169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; }; - ABF50BCE169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; }; - ABF50BCF169F61540018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B77169F61540018C08D /* compiler.cpp */; }; - ABF50BD0169F61540018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B79169F61540018C08D /* compilercontext.cpp */; }; - ABF50BD1169F61540018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7B169F61540018C08D /* compilerfunc.cpp */; }; - ABF50BD2169F61540018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7D169F61540018C08D /* compileritem.cpp */; }; - ABF50BD3169F61540018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7F169F61540018C08D /* context.cpp */; }; - ABF50BD4169F61540018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B81169F61540018C08D /* cpuinfo.cpp */; }; - ABF50BD5169F61540018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B83169F61540018C08D /* defs.cpp */; }; - ABF50BD6169F61540018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B85169F61540018C08D /* func.cpp */; }; - ABF50BD7169F61540018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B89169F61540018C08D /* logger.cpp */; }; - ABF50BD8169F61540018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8B169F61540018C08D /* memorymanager.cpp */; }; - ABF50BD9169F61540018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8D169F61540018C08D /* memorymarker.cpp */; }; - ABF50BDA169F61540018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8F169F61540018C08D /* operand.cpp */; }; - ABF50BDB169F61540018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B92169F61540018C08D /* stringbuilder.cpp */; }; - ABF50BDC169F61540018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B94169F61540018C08D /* stringutil.cpp */; }; - ABF50BDD169F61540018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B96169F61540018C08D /* virtualmemory.cpp */; }; - ABF50BDE169F61540018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B98169F61540018C08D /* zonememory.cpp */; }; - ABF50BDF169F61540018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9B169F61540018C08D /* x86assembler.cpp */; }; - ABF50BE0169F61540018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9D169F61540018C08D /* x86compiler.cpp */; }; - ABF50BE1169F61540018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9F169F61540018C08D /* x86compilercontext.cpp */; }; - ABF50BE2169F61540018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA1169F61540018C08D /* x86compilerfunc.cpp */; }; - ABF50BE3169F61540018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA3169F61540018C08D /* x86compileritem.cpp */; }; - ABF50BE4169F61540018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA5169F61540018C08D /* x86cpuinfo.cpp */; }; - ABF50BE5169F61540018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA7169F61540018C08D /* x86defs.cpp */; }; - ABF50BE6169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; }; - ABF50BE7169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; - ABF50BE8169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; ABF50BE9169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; }; ABF50BEA169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; }; ABF50BEB169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; }; @@ -983,35 +955,6 @@ ABF50C20169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; }; ABF50C21169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; ABF50C22169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; - ABF50C23169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; }; - ABF50C24169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; }; - ABF50C25169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; }; - ABF50C26169F61540018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B77169F61540018C08D /* compiler.cpp */; }; - ABF50C27169F61540018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B79169F61540018C08D /* compilercontext.cpp */; }; - ABF50C28169F61540018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7B169F61540018C08D /* compilerfunc.cpp */; }; - ABF50C29169F61540018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7D169F61540018C08D /* compileritem.cpp */; }; - ABF50C2A169F61540018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7F169F61540018C08D /* context.cpp */; }; - ABF50C2B169F61540018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B81169F61540018C08D /* cpuinfo.cpp */; }; - ABF50C2C169F61540018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B83169F61540018C08D /* defs.cpp */; }; - ABF50C2D169F61540018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B85169F61540018C08D /* func.cpp */; }; - ABF50C2E169F61540018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B89169F61540018C08D /* logger.cpp */; }; - ABF50C2F169F61540018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8B169F61540018C08D /* memorymanager.cpp */; }; - ABF50C30169F61540018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8D169F61540018C08D /* memorymarker.cpp */; }; - ABF50C31169F61540018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8F169F61540018C08D /* operand.cpp */; }; - ABF50C32169F61540018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B92169F61540018C08D /* stringbuilder.cpp */; }; - ABF50C33169F61540018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B94169F61540018C08D /* stringutil.cpp */; }; - ABF50C34169F61540018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B96169F61540018C08D /* virtualmemory.cpp */; }; - ABF50C35169F61540018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B98169F61540018C08D /* zonememory.cpp */; }; - ABF50C36169F61540018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9B169F61540018C08D /* x86assembler.cpp */; }; - ABF50C37169F61540018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9D169F61540018C08D /* x86compiler.cpp */; }; - ABF50C38169F61540018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9F169F61540018C08D /* x86compilercontext.cpp */; }; - ABF50C39169F61540018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA1169F61540018C08D /* x86compilerfunc.cpp */; }; - ABF50C3A169F61540018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA3169F61540018C08D /* x86compileritem.cpp */; }; - ABF50C3B169F61540018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA5169F61540018C08D /* x86cpuinfo.cpp */; }; - ABF50C3C169F61540018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA7169F61540018C08D /* x86defs.cpp */; }; - ABF50C3D169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; }; - ABF50C3E169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; - ABF50C3F169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; ABF50C40169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; }; ABF50C41169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; }; ABF50C42169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; }; @@ -1041,35 +984,6 @@ ABF50C5A169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; }; ABF50C5B169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; ABF50C5C169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; - ABF50C5D169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; }; - ABF50C5E169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; }; - ABF50C5F169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; }; - ABF50C60169F61540018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B77169F61540018C08D /* compiler.cpp */; }; - ABF50C61169F61540018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B79169F61540018C08D /* compilercontext.cpp */; }; - ABF50C62169F61540018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7B169F61540018C08D /* compilerfunc.cpp */; }; - ABF50C63169F61540018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7D169F61540018C08D /* compileritem.cpp */; }; - ABF50C64169F61540018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7F169F61540018C08D /* context.cpp */; }; - ABF50C65169F61540018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B81169F61540018C08D /* cpuinfo.cpp */; }; - ABF50C66169F61540018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B83169F61540018C08D /* defs.cpp */; }; - ABF50C67169F61540018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B85169F61540018C08D /* func.cpp */; }; - ABF50C68169F61540018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B89169F61540018C08D /* logger.cpp */; }; - ABF50C69169F61540018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8B169F61540018C08D /* memorymanager.cpp */; }; - ABF50C6A169F61540018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8D169F61540018C08D /* memorymarker.cpp */; }; - ABF50C6B169F61540018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8F169F61540018C08D /* operand.cpp */; }; - ABF50C6C169F61540018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B92169F61540018C08D /* stringbuilder.cpp */; }; - ABF50C6D169F61540018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B94169F61540018C08D /* stringutil.cpp */; }; - ABF50C6E169F61540018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B96169F61540018C08D /* virtualmemory.cpp */; }; - ABF50C6F169F61540018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B98169F61540018C08D /* zonememory.cpp */; }; - ABF50C70169F61540018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9B169F61540018C08D /* x86assembler.cpp */; }; - ABF50C71169F61540018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9D169F61540018C08D /* x86compiler.cpp */; }; - ABF50C72169F61540018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9F169F61540018C08D /* x86compilercontext.cpp */; }; - ABF50C73169F61540018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA1169F61540018C08D /* x86compilerfunc.cpp */; }; - ABF50C74169F61540018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA3169F61540018C08D /* x86compileritem.cpp */; }; - ABF50C75169F61540018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA5169F61540018C08D /* x86cpuinfo.cpp */; }; - ABF50C76169F61540018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA7169F61540018C08D /* x86defs.cpp */; }; - ABF50C77169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; }; - ABF50C78169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; - ABF50C79169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; ABFE4242143E32F0009A3CCE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F4B55090F53924500C8B514 /* Localizable.strings */; }; ABFE4251143E32F0009A3CCE /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; ABFE4252143E32F0009A3CCE /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; @@ -3335,35 +3249,6 @@ AB18153D15D212B4007A6CC3 /* coreaudiosound.cpp in Sources */, AB18153E15D212B4007A6CC3 /* ringbuffer.cpp in Sources */, AB1816B615D216EC007A6CC3 /* OGLRender.cpp in Sources */, - ABF50C23169F61540018C08D /* assembler.cpp in Sources */, - ABF50C24169F61540018C08D /* assert.cpp in Sources */, - ABF50C25169F61540018C08D /* buffer.cpp in Sources */, - ABF50C26169F61540018C08D /* compiler.cpp in Sources */, - ABF50C27169F61540018C08D /* compilercontext.cpp in Sources */, - ABF50C28169F61540018C08D /* compilerfunc.cpp in Sources */, - ABF50C29169F61540018C08D /* compileritem.cpp in Sources */, - ABF50C2A169F61540018C08D /* context.cpp in Sources */, - ABF50C2B169F61540018C08D /* cpuinfo.cpp in Sources */, - ABF50C2C169F61540018C08D /* defs.cpp in Sources */, - ABF50C2D169F61540018C08D /* func.cpp in Sources */, - ABF50C2E169F61540018C08D /* logger.cpp in Sources */, - ABF50C2F169F61540018C08D /* memorymanager.cpp in Sources */, - ABF50C30169F61540018C08D /* memorymarker.cpp in Sources */, - ABF50C31169F61540018C08D /* operand.cpp in Sources */, - ABF50C32169F61540018C08D /* stringbuilder.cpp in Sources */, - ABF50C33169F61540018C08D /* stringutil.cpp in Sources */, - ABF50C34169F61540018C08D /* virtualmemory.cpp in Sources */, - ABF50C35169F61540018C08D /* zonememory.cpp in Sources */, - ABF50C36169F61540018C08D /* x86assembler.cpp in Sources */, - ABF50C37169F61540018C08D /* x86compiler.cpp in Sources */, - ABF50C38169F61540018C08D /* x86compilercontext.cpp in Sources */, - ABF50C39169F61540018C08D /* x86compilerfunc.cpp in Sources */, - ABF50C3A169F61540018C08D /* x86compileritem.cpp in Sources */, - ABF50C3B169F61540018C08D /* x86cpuinfo.cpp in Sources */, - ABF50C3C169F61540018C08D /* x86defs.cpp in Sources */, - ABF50C3D169F61540018C08D /* x86func.cpp in Sources */, - ABF50C3E169F61540018C08D /* x86operand.cpp in Sources */, - ABF50C3F169F61540018C08D /* x86util.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3473,35 +3358,7 @@ AB1815D815D21469007A6CC3 /* video_output_view_legacy.mm in Sources */, AB1815D915D21469007A6CC3 /* coreaudiosound.cpp in Sources */, AB1815DA15D21469007A6CC3 /* ringbuffer.cpp in Sources */, - ABF50C5D169F61540018C08D /* assembler.cpp in Sources */, - ABF50C5E169F61540018C08D /* assert.cpp in Sources */, - ABF50C5F169F61540018C08D /* buffer.cpp in Sources */, - ABF50C60169F61540018C08D /* compiler.cpp in Sources */, - ABF50C61169F61540018C08D /* compilercontext.cpp in Sources */, - ABF50C62169F61540018C08D /* compilerfunc.cpp in Sources */, - ABF50C63169F61540018C08D /* compileritem.cpp in Sources */, - ABF50C64169F61540018C08D /* context.cpp in Sources */, - ABF50C65169F61540018C08D /* cpuinfo.cpp in Sources */, - ABF50C66169F61540018C08D /* defs.cpp in Sources */, - ABF50C67169F61540018C08D /* func.cpp in Sources */, - ABF50C68169F61540018C08D /* logger.cpp in Sources */, - ABF50C69169F61540018C08D /* memorymanager.cpp in Sources */, - ABF50C6A169F61540018C08D /* memorymarker.cpp in Sources */, - ABF50C6B169F61540018C08D /* operand.cpp in Sources */, - ABF50C6C169F61540018C08D /* stringbuilder.cpp in Sources */, - ABF50C6D169F61540018C08D /* stringutil.cpp in Sources */, - ABF50C6E169F61540018C08D /* virtualmemory.cpp in Sources */, - ABF50C6F169F61540018C08D /* zonememory.cpp in Sources */, - ABF50C70169F61540018C08D /* x86assembler.cpp in Sources */, - ABF50C71169F61540018C08D /* x86compiler.cpp in Sources */, - ABF50C72169F61540018C08D /* x86compilercontext.cpp in Sources */, - ABF50C73169F61540018C08D /* x86compilerfunc.cpp in Sources */, - ABF50C74169F61540018C08D /* x86compileritem.cpp in Sources */, - ABF50C75169F61540018C08D /* x86cpuinfo.cpp in Sources */, - ABF50C76169F61540018C08D /* x86defs.cpp in Sources */, - ABF50C77169F61540018C08D /* x86func.cpp in Sources */, - ABF50C78169F61540018C08D /* x86operand.cpp in Sources */, - ABF50C79169F61540018C08D /* x86util.cpp in Sources */, + AB4F981716C30117000E90EA /* OGLRender.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3622,35 +3479,6 @@ AB18167F15D214F2007A6CC3 /* coreaudiosound.cpp in Sources */, AB18168015D214F2007A6CC3 /* ringbuffer.cpp in Sources */, AB1816B815D216F5007A6CC3 /* OGLRender.cpp in Sources */, - ABF50BCC169F61540018C08D /* assembler.cpp in Sources */, - ABF50BCD169F61540018C08D /* assert.cpp in Sources */, - ABF50BCE169F61540018C08D /* buffer.cpp in Sources */, - ABF50BCF169F61540018C08D /* compiler.cpp in Sources */, - ABF50BD0169F61540018C08D /* compilercontext.cpp in Sources */, - ABF50BD1169F61540018C08D /* compilerfunc.cpp in Sources */, - ABF50BD2169F61540018C08D /* compileritem.cpp in Sources */, - ABF50BD3169F61540018C08D /* context.cpp in Sources */, - ABF50BD4169F61540018C08D /* cpuinfo.cpp in Sources */, - ABF50BD5169F61540018C08D /* defs.cpp in Sources */, - ABF50BD6169F61540018C08D /* func.cpp in Sources */, - ABF50BD7169F61540018C08D /* logger.cpp in Sources */, - ABF50BD8169F61540018C08D /* memorymanager.cpp in Sources */, - ABF50BD9169F61540018C08D /* memorymarker.cpp in Sources */, - ABF50BDA169F61540018C08D /* operand.cpp in Sources */, - ABF50BDB169F61540018C08D /* stringbuilder.cpp in Sources */, - ABF50BDC169F61540018C08D /* stringutil.cpp in Sources */, - ABF50BDD169F61540018C08D /* virtualmemory.cpp in Sources */, - ABF50BDE169F61540018C08D /* zonememory.cpp in Sources */, - ABF50BDF169F61540018C08D /* x86assembler.cpp in Sources */, - ABF50BE0169F61540018C08D /* x86compiler.cpp in Sources */, - ABF50BE1169F61540018C08D /* x86compilercontext.cpp in Sources */, - ABF50BE2169F61540018C08D /* x86compilerfunc.cpp in Sources */, - ABF50BE3169F61540018C08D /* x86compileritem.cpp in Sources */, - ABF50BE4169F61540018C08D /* x86cpuinfo.cpp in Sources */, - ABF50BE5169F61540018C08D /* x86defs.cpp in Sources */, - ABF50BE6169F61540018C08D /* x86func.cpp in Sources */, - ABF50BE7169F61540018C08D /* x86operand.cpp in Sources */, - ABF50BE8169F61540018C08D /* x86util.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj index e15e76226..da977bb4c 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj @@ -819,64 +819,6 @@ ABF50AD4169F5FDA0018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB4169F5FDA0018C08D /* x86func.cpp */; }; ABF50AD5169F5FDA0018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB6169F5FDA0018C08D /* x86operand.cpp */; }; ABF50AD6169F5FDA0018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB8169F5FDA0018C08D /* x86util.cpp */; }; - ABF50AD7169F5FDA0018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7B169F5FDA0018C08D /* assembler.cpp */; }; - ABF50AD8169F5FDA0018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7D169F5FDA0018C08D /* assert.cpp */; }; - ABF50AD9169F5FDA0018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7F169F5FDA0018C08D /* buffer.cpp */; }; - ABF50ADA169F5FDA0018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A82169F5FDA0018C08D /* compiler.cpp */; }; - ABF50ADB169F5FDA0018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A84169F5FDA0018C08D /* compilercontext.cpp */; }; - ABF50ADC169F5FDA0018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A86169F5FDA0018C08D /* compilerfunc.cpp */; }; - ABF50ADD169F5FDA0018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A88169F5FDA0018C08D /* compileritem.cpp */; }; - ABF50ADE169F5FDA0018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8A169F5FDA0018C08D /* context.cpp */; }; - ABF50ADF169F5FDA0018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8C169F5FDA0018C08D /* cpuinfo.cpp */; }; - ABF50AE0169F5FDA0018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8E169F5FDA0018C08D /* defs.cpp */; }; - ABF50AE1169F5FDA0018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A90169F5FDA0018C08D /* func.cpp */; }; - ABF50AE2169F5FDA0018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A94169F5FDA0018C08D /* logger.cpp */; }; - ABF50AE3169F5FDA0018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A96169F5FDA0018C08D /* memorymanager.cpp */; }; - ABF50AE4169F5FDA0018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A98169F5FDA0018C08D /* memorymarker.cpp */; }; - ABF50AE5169F5FDA0018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9A169F5FDA0018C08D /* operand.cpp */; }; - ABF50AE6169F5FDA0018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9D169F5FDA0018C08D /* stringbuilder.cpp */; }; - ABF50AE7169F5FDA0018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9F169F5FDA0018C08D /* stringutil.cpp */; }; - ABF50AE8169F5FDA0018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA1169F5FDA0018C08D /* virtualmemory.cpp */; }; - ABF50AE9169F5FDA0018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA3169F5FDA0018C08D /* zonememory.cpp */; }; - ABF50AEA169F5FDA0018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA6169F5FDA0018C08D /* x86assembler.cpp */; }; - ABF50AEB169F5FDA0018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA8169F5FDA0018C08D /* x86compiler.cpp */; }; - ABF50AEC169F5FDA0018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAA169F5FDA0018C08D /* x86compilercontext.cpp */; }; - ABF50AED169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAC169F5FDA0018C08D /* x86compilerfunc.cpp */; }; - ABF50AEE169F5FDA0018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAE169F5FDA0018C08D /* x86compileritem.cpp */; }; - ABF50AEF169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB0169F5FDA0018C08D /* x86cpuinfo.cpp */; }; - ABF50AF0169F5FDA0018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB2169F5FDA0018C08D /* x86defs.cpp */; }; - ABF50AF1169F5FDA0018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB4169F5FDA0018C08D /* x86func.cpp */; }; - ABF50AF2169F5FDA0018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB6169F5FDA0018C08D /* x86operand.cpp */; }; - ABF50AF3169F5FDA0018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB8169F5FDA0018C08D /* x86util.cpp */; }; - ABF50AF4169F5FDA0018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7B169F5FDA0018C08D /* assembler.cpp */; }; - ABF50AF5169F5FDA0018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7D169F5FDA0018C08D /* assert.cpp */; }; - ABF50AF6169F5FDA0018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7F169F5FDA0018C08D /* buffer.cpp */; }; - ABF50AF7169F5FDA0018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A82169F5FDA0018C08D /* compiler.cpp */; }; - ABF50AF8169F5FDA0018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A84169F5FDA0018C08D /* compilercontext.cpp */; }; - ABF50AF9169F5FDA0018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A86169F5FDA0018C08D /* compilerfunc.cpp */; }; - ABF50AFA169F5FDA0018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A88169F5FDA0018C08D /* compileritem.cpp */; }; - ABF50AFB169F5FDA0018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8A169F5FDA0018C08D /* context.cpp */; }; - ABF50AFC169F5FDA0018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8C169F5FDA0018C08D /* cpuinfo.cpp */; }; - ABF50AFD169F5FDA0018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8E169F5FDA0018C08D /* defs.cpp */; }; - ABF50AFE169F5FDA0018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A90169F5FDA0018C08D /* func.cpp */; }; - ABF50AFF169F5FDA0018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A94169F5FDA0018C08D /* logger.cpp */; }; - ABF50B00169F5FDA0018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A96169F5FDA0018C08D /* memorymanager.cpp */; }; - ABF50B01169F5FDA0018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A98169F5FDA0018C08D /* memorymarker.cpp */; }; - ABF50B02169F5FDA0018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9A169F5FDA0018C08D /* operand.cpp */; }; - ABF50B03169F5FDA0018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9D169F5FDA0018C08D /* stringbuilder.cpp */; }; - ABF50B04169F5FDA0018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9F169F5FDA0018C08D /* stringutil.cpp */; }; - ABF50B05169F5FDA0018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA1169F5FDA0018C08D /* virtualmemory.cpp */; }; - ABF50B06169F5FDA0018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA3169F5FDA0018C08D /* zonememory.cpp */; }; - ABF50B07169F5FDA0018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA6169F5FDA0018C08D /* x86assembler.cpp */; }; - ABF50B08169F5FDA0018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA8169F5FDA0018C08D /* x86compiler.cpp */; }; - ABF50B09169F5FDA0018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAA169F5FDA0018C08D /* x86compilercontext.cpp */; }; - ABF50B0A169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAC169F5FDA0018C08D /* x86compilerfunc.cpp */; }; - ABF50B0B169F5FDA0018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAE169F5FDA0018C08D /* x86compileritem.cpp */; }; - ABF50B0C169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB0169F5FDA0018C08D /* x86cpuinfo.cpp */; }; - ABF50B0D169F5FDA0018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB2169F5FDA0018C08D /* x86defs.cpp */; }; - ABF50B0E169F5FDA0018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB4169F5FDA0018C08D /* x86func.cpp */; }; - ABF50B0F169F5FDA0018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB6169F5FDA0018C08D /* x86operand.cpp */; }; - ABF50B10169F5FDA0018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB8169F5FDA0018C08D /* x86util.cpp */; }; ABF50B11169F5FDA0018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7B169F5FDA0018C08D /* assembler.cpp */; }; ABF50B12169F5FDA0018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7D169F5FDA0018C08D /* assert.cpp */; }; ABF50B13169F5FDA0018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7F169F5FDA0018C08D /* buffer.cpp */; }; @@ -2680,35 +2622,6 @@ AB2F3C3815CF9C6000858373 /* coreaudiosound.cpp in Sources */, AB2F3C3915CF9C6000858373 /* ringbuffer.cpp in Sources */, ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */, - ABF50AD7169F5FDA0018C08D /* assembler.cpp in Sources */, - ABF50AD8169F5FDA0018C08D /* assert.cpp in Sources */, - ABF50AD9169F5FDA0018C08D /* buffer.cpp in Sources */, - ABF50ADA169F5FDA0018C08D /* compiler.cpp in Sources */, - ABF50ADB169F5FDA0018C08D /* compilercontext.cpp in Sources */, - ABF50ADC169F5FDA0018C08D /* compilerfunc.cpp in Sources */, - ABF50ADD169F5FDA0018C08D /* compileritem.cpp in Sources */, - ABF50ADE169F5FDA0018C08D /* context.cpp in Sources */, - ABF50ADF169F5FDA0018C08D /* cpuinfo.cpp in Sources */, - ABF50AE0169F5FDA0018C08D /* defs.cpp in Sources */, - ABF50AE1169F5FDA0018C08D /* func.cpp in Sources */, - ABF50AE2169F5FDA0018C08D /* logger.cpp in Sources */, - ABF50AE3169F5FDA0018C08D /* memorymanager.cpp in Sources */, - ABF50AE4169F5FDA0018C08D /* memorymarker.cpp in Sources */, - ABF50AE5169F5FDA0018C08D /* operand.cpp in Sources */, - ABF50AE6169F5FDA0018C08D /* stringbuilder.cpp in Sources */, - ABF50AE7169F5FDA0018C08D /* stringutil.cpp in Sources */, - ABF50AE8169F5FDA0018C08D /* virtualmemory.cpp in Sources */, - ABF50AE9169F5FDA0018C08D /* zonememory.cpp in Sources */, - ABF50AEA169F5FDA0018C08D /* x86assembler.cpp in Sources */, - ABF50AEB169F5FDA0018C08D /* x86compiler.cpp in Sources */, - ABF50AEC169F5FDA0018C08D /* x86compilercontext.cpp in Sources */, - ABF50AED169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */, - ABF50AEE169F5FDA0018C08D /* x86compileritem.cpp in Sources */, - ABF50AEF169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */, - ABF50AF0169F5FDA0018C08D /* x86defs.cpp in Sources */, - ABF50AF1169F5FDA0018C08D /* x86func.cpp in Sources */, - ABF50AF2169F5FDA0018C08D /* x86operand.cpp in Sources */, - ABF50AF3169F5FDA0018C08D /* x86util.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3144,35 +3057,6 @@ ABAD102E15ACE7A00000EC47 /* coreaudiosound.cpp in Sources */, ABAD102F15ACE7A00000EC47 /* ringbuffer.cpp in Sources */, ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */, - ABF50AF4169F5FDA0018C08D /* assembler.cpp in Sources */, - ABF50AF5169F5FDA0018C08D /* assert.cpp in Sources */, - ABF50AF6169F5FDA0018C08D /* buffer.cpp in Sources */, - ABF50AF7169F5FDA0018C08D /* compiler.cpp in Sources */, - ABF50AF8169F5FDA0018C08D /* compilercontext.cpp in Sources */, - ABF50AF9169F5FDA0018C08D /* compilerfunc.cpp in Sources */, - ABF50AFA169F5FDA0018C08D /* compileritem.cpp in Sources */, - ABF50AFB169F5FDA0018C08D /* context.cpp in Sources */, - ABF50AFC169F5FDA0018C08D /* cpuinfo.cpp in Sources */, - ABF50AFD169F5FDA0018C08D /* defs.cpp in Sources */, - ABF50AFE169F5FDA0018C08D /* func.cpp in Sources */, - ABF50AFF169F5FDA0018C08D /* logger.cpp in Sources */, - ABF50B00169F5FDA0018C08D /* memorymanager.cpp in Sources */, - ABF50B01169F5FDA0018C08D /* memorymarker.cpp in Sources */, - ABF50B02169F5FDA0018C08D /* operand.cpp in Sources */, - ABF50B03169F5FDA0018C08D /* stringbuilder.cpp in Sources */, - ABF50B04169F5FDA0018C08D /* stringutil.cpp in Sources */, - ABF50B05169F5FDA0018C08D /* virtualmemory.cpp in Sources */, - ABF50B06169F5FDA0018C08D /* zonememory.cpp in Sources */, - ABF50B07169F5FDA0018C08D /* x86assembler.cpp in Sources */, - ABF50B08169F5FDA0018C08D /* x86compiler.cpp in Sources */, - ABF50B09169F5FDA0018C08D /* x86compilercontext.cpp in Sources */, - ABF50B0A169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */, - ABF50B0B169F5FDA0018C08D /* x86compileritem.cpp in Sources */, - ABF50B0C169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */, - ABF50B0D169F5FDA0018C08D /* x86defs.cpp in Sources */, - ABF50B0E169F5FDA0018C08D /* x86func.cpp in Sources */, - ABF50B0F169F5FDA0018C08D /* x86operand.cpp in Sources */, - ABF50B10169F5FDA0018C08D /* x86util.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj index 1146036b1..a253dd89e 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj @@ -64,6 +64,8 @@ AB1B9E661501A78000464647 /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E601501A78000464647 /* ringbuffer.cpp */; }; AB1F468413A0ADE400B80DE6 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; }; AB1F469813A0AE2F00B80DE6 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; }; + AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */; }; + AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; }; AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; }; AB350B6A1478A5B3007165AC /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; }; AB350BA51478AC96007165AC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB350BA41478AC96007165AC /* IOKit.framework */; }; @@ -672,6 +674,7 @@ AB1B9E601501A78000464647 /* ringbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ringbuffer.cpp; sourceTree = SOURCE_ROOT; }; AB1B9E611501A78000464647 /* coreaudiosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coreaudiosound.h; sourceTree = SOURCE_ROOT; }; AB1B9E621501A78000464647 /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ringbuffer.h; sourceTree = SOURCE_ROOT; }; + AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macosx_10_5_compat.cpp; sourceTree = ""; }; AB350B681478A5B3007165AC /* cocoa_hid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_hid.h; sourceTree = ""; }; AB350B691478A5B3007165AC /* cocoa_hid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_hid.mm; sourceTree = ""; }; AB350BA41478AC96007165AC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; @@ -1095,6 +1098,7 @@ ABB3C63A1501BB8300E0C22E /* openemu */, AB3ACB6514C2361100D7D192 /* userinterface */, AB1B9E5F1501A78000464647 /* coreaudiosound.cpp */, + AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */, AB1B9E601501A78000464647 /* ringbuffer.cpp */, ABD104141346652500AF11D1 /* sndOSX.cpp */, AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */, @@ -2219,6 +2223,8 @@ AB40568E169F5DCC0016AC3E /* x86func.cpp in Sources */, AB405691169F5DCC0016AC3E /* x86operand.cpp in Sources */, AB405694169F5DCC0016AC3E /* x86util.cpp in Sources */, + AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */, + AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2614,15 +2620,17 @@ isa = XCBuildConfiguration; buildSettings = { MACOSX_DEPLOYMENT_TARGET = 10.5; - SDKROOT = macosx10.5; }; name = Debug; }; C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, + PUBLIC_RELEASE, + ); MACOSX_DEPLOYMENT_TARGET = 10.5; - SDKROOT = macosx10.5; }; name = Release; }; diff --git a/desmume/src/cocoa/cocoa_output.mm b/desmume/src/cocoa/cocoa_output.mm index 412152dc6..3ac1c2984 100644 --- a/desmume/src/cocoa/cocoa_output.mm +++ b/desmume/src/cocoa/cocoa_output.mm @@ -28,6 +28,8 @@ #include "../SPU.h" #include "../metaspu/metaspu.h" +#include + #ifdef MAC_OS_X_VERSION_10_7 #include "../OGLRender_3_2.h" #else diff --git a/desmume/src/cocoa/macosx_10_5_compat.cpp b/desmume/src/cocoa/macosx_10_5_compat.cpp new file mode 100644 index 000000000..a4b843a10 --- /dev/null +++ b/desmume/src/cocoa/macosx_10_5_compat.cpp @@ -0,0 +1,90 @@ +/* + Copyright (C) 2013 DeSmuME team + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with the this software. If not, see . + */ + +#include +#include + + +// Workarounds for symbols that are missing from Leopard stdlibc++.dylib. +// http://stackoverflow.com/questions/3484043/os-x-program-runs-on-dev-machine-crashing-horribly-on-others + +_GLIBCXX_BEGIN_NAMESPACE(std) + +// From ostream_insert.h +template ostream& __ostream_insert(ostream&, const char*, streamsize); + +#ifdef _GLIBCXX_USE_WCHAR_T +template wostream& __ostream_insert(wostream&, const wchar_t*, streamsize); +#endif + +// From ostream.tcc +template ostream& ostream::_M_insert(long); +template ostream& ostream::_M_insert(unsigned long); +template ostream& ostream::_M_insert(bool); +#ifdef _GLIBCXX_USE_LONG_LONG +template ostream& ostream::_M_insert(long long); +template ostream& ostream::_M_insert(unsigned long long); +#endif +template ostream& ostream::_M_insert(double); +template ostream& ostream::_M_insert(long double); +template ostream& ostream::_M_insert(const void*); + +#ifdef _GLIBCXX_USE_WCHAR_T +template wostream& wostream::_M_insert(long); +template wostream& wostream::_M_insert(unsigned long); +template wostream& wostream::_M_insert(bool); +#ifdef _GLIBCXX_USE_LONG_LONG +template wostream& wostream::_M_insert(long long); +template wostream& wostream::_M_insert(unsigned long long); +#endif +template wostream& wostream::_M_insert(double); +template wostream& wostream::_M_insert(long double); +template wostream& wostream::_M_insert(const void*); +#endif + +// From istream.tcc +template istream& istream::_M_extract(unsigned short&); +template istream& istream::_M_extract(unsigned int&); +template istream& istream::_M_extract(long&); +template istream& istream::_M_extract(unsigned long&); +template istream& istream::_M_extract(bool&); +#ifdef _GLIBCXX_USE_LONG_LONG +template istream& istream::_M_extract(long long&); +template istream& istream::_M_extract(unsigned long long&); +#endif +template istream& istream::_M_extract(float&); +template istream& istream::_M_extract(double&); +template istream& istream::_M_extract(long double&); +template istream& istream::_M_extract(void*&); + +#ifdef _GLIBCXX_USE_WCHAR_T +template wistream& wistream::_M_extract(unsigned short&); +template wistream& wistream::_M_extract(unsigned int&); +template wistream& wistream::_M_extract(long&); +template wistream& wistream::_M_extract(unsigned long&); +template wistream& wistream::_M_extract(bool&); +#ifdef _GLIBCXX_USE_LONG_LONG +template wistream& wistream::_M_extract(long long&); +template wistream& wistream::_M_extract(unsigned long long&); +#endif +template wistream& wistream::_M_extract(float&); +template wistream& wistream::_M_extract(double&); +template wistream& wistream::_M_extract(long double&); +template wistream& wistream::_M_extract(void*&); +#endif + +_GLIBCXX_END_NAMESPACE