From 48a849adba5e0bb737010bbd6406db745f147c59 Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 11 Jan 2012 23:31:12 +0000 Subject: [PATCH] Cocoa Port: - Rename legacy files to distinguish them from new code. - Set svn to ignore xibs from non-English translations. --- .../project.pbxproj | 160 +++++++++--------- ...Debug).plist => Info (Legacy Debug).plist} | 0 .../cocoa/{Info.plist => Info (Legacy).plist} | 0 .../{cocoa_input.h => cocoa_input_legacy.h} | 0 .../{cocoa_input.mm => cocoa_input_legacy.mm} | 2 +- desmume/src/cocoa/{input.h => input_legacy.h} | 0 .../src/cocoa/{input.mm => input_legacy.mm} | 6 +- .../{nds_control.h => nds_control_legacy.h} | 0 .../{nds_control.mm => nds_control_legacy.mm} | 8 +- .../{preferences.h => preferences_legacy.h} | 0 .../{preferences.mm => preferences_legacy.mm} | 4 +- .../{screen_state.h => screen_state_legacy.h} | 0 .../{screen_state.m => screen_state_legacy.m} | 2 +- .../cocoa/userinterface/appDelegate_legacy.mm | 8 +- .../userinterface/emuWindowDelegate_legacy.mm | 6 +- ...tput_view.h => video_output_view_legacy.h} | 0 ...ut_view.mm => video_output_view_legacy.mm} | 12 +- 17 files changed, 104 insertions(+), 104 deletions(-) rename desmume/src/cocoa/{Info (Debug).plist => Info (Legacy Debug).plist} (100%) rename desmume/src/cocoa/{Info.plist => Info (Legacy).plist} (100%) rename desmume/src/cocoa/{cocoa_input.h => cocoa_input_legacy.h} (100%) rename desmume/src/cocoa/{cocoa_input.mm => cocoa_input_legacy.mm} (99%) rename desmume/src/cocoa/{input.h => input_legacy.h} (100%) rename desmume/src/cocoa/{input.mm => input_legacy.mm} (99%) rename desmume/src/cocoa/{nds_control.h => nds_control_legacy.h} (100%) rename desmume/src/cocoa/{nds_control.mm => nds_control_legacy.mm} (99%) rename desmume/src/cocoa/{preferences.h => preferences_legacy.h} (100%) rename desmume/src/cocoa/{preferences.mm => preferences_legacy.mm} (99%) rename desmume/src/cocoa/{screen_state.h => screen_state_legacy.h} (100%) rename desmume/src/cocoa/{screen_state.m => screen_state_legacy.m} (99%) rename desmume/src/cocoa/{video_output_view.h => video_output_view_legacy.h} (100%) rename desmume/src/cocoa/{video_output_view.mm => video_output_view_legacy.mm} (98%) diff --git a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj index 87566728a..32db8519f 100644 --- a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj @@ -28,18 +28,6 @@ AB0191D414BD72EC004CB612 /* MainMenu (Legacy).xib in Resources */ = {isa = PBXBuildFile; fileRef = AB0191D214BD72EC004CB612 /* MainMenu (Legacy).xib */; }; AB0191D514BD72EC004CB612 /* MainMenu (Legacy).xib in Resources */ = {isa = PBXBuildFile; fileRef = AB0191D214BD72EC004CB612 /* MainMenu (Legacy).xib */; }; AB0191D614BD72EC004CB612 /* MainMenu (Legacy).xib in Resources */ = {isa = PBXBuildFile; fileRef = AB0191D214BD72EC004CB612 /* MainMenu (Legacy).xib */; }; - AB06CB59135B8A4D00E977B3 /* screen_state.m in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4D135B8A4D00E977B3 /* screen_state.m */; }; - AB06CB5A135B8A4D00E977B3 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4E135B8A4D00E977B3 /* cocoa_input.mm */; }; - AB06CB5B135B8A4D00E977B3 /* input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4F135B8A4D00E977B3 /* input.mm */; }; - AB06CB5E135B8A4D00E977B3 /* nds_control.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB52135B8A4D00E977B3 /* nds_control.mm */; }; - AB06CB5F135B8A4D00E977B3 /* preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB53135B8A4D00E977B3 /* preferences.mm */; }; - AB06CB62135B8A4D00E977B3 /* video_output_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB56135B8A4D00E977B3 /* video_output_view.mm */; }; - AB06CB65135B8A4D00E977B3 /* screen_state.m in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4D135B8A4D00E977B3 /* screen_state.m */; }; - AB06CB66135B8A4D00E977B3 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4E135B8A4D00E977B3 /* cocoa_input.mm */; }; - AB06CB67135B8A4D00E977B3 /* input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4F135B8A4D00E977B3 /* input.mm */; }; - AB06CB6A135B8A4D00E977B3 /* nds_control.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB52135B8A4D00E977B3 /* nds_control.mm */; }; - AB06CB6B135B8A4D00E977B3 /* preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB53135B8A4D00E977B3 /* preferences.mm */; }; - AB06CB6E135B8A4D00E977B3 /* video_output_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB56135B8A4D00E977B3 /* video_output_view.mm */; }; AB06CCD6135B8AA200E977B3 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; AB06CCD7135B8AA300E977B3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; AB06CD3D135B8ACE00E977B3 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; @@ -221,12 +209,6 @@ AB06CE96135B8AEE00E977B3 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CE11135B8AED00E977B3 /* xstring.cpp */; }; AB0A0D1E14AACACC00E83E91 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1D14AACACC00E83E91 /* libz.dylib */; }; AB0A0D3714AACE9500E83E91 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F4B55090F53924500C8B514 /* Localizable.strings */; }; - AB0A0D3C14AACE9500E83E91 /* screen_state.m in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4D135B8A4D00E977B3 /* screen_state.m */; }; - AB0A0D3D14AACE9500E83E91 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4E135B8A4D00E977B3 /* cocoa_input.mm */; }; - AB0A0D3E14AACE9500E83E91 /* input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4F135B8A4D00E977B3 /* input.mm */; }; - AB0A0D4114AACE9500E83E91 /* nds_control.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB52135B8A4D00E977B3 /* nds_control.mm */; }; - AB0A0D4214AACE9500E83E91 /* preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB53135B8A4D00E977B3 /* preferences.mm */; }; - AB0A0D4514AACE9500E83E91 /* video_output_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB56135B8A4D00E977B3 /* video_output_view.mm */; }; AB0A0D4614AACE9500E83E91 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB0A0D4714AACE9500E83E91 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB0A0D4814AACE9500E83E91 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; @@ -398,6 +380,30 @@ ABBF053114B5436E00E505A0 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBF052F14B5436E00E505A0 /* cocoa_file.mm */; }; ABBF053214B5436E00E505A0 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBF052F14B5436E00E505A0 /* cocoa_file.mm */; }; ABBF053314B5436E00E505A0 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBF052F14B5436E00E505A0 /* cocoa_file.mm */; }; + ABE240FF14BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F414BE3169006EA2D5 /* cocoa_input_legacy.mm */; }; + ABE2410014BE3169006EA2D5 /* input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F614BE3169006EA2D5 /* input_legacy.mm */; }; + ABE2410114BE3169006EA2D5 /* nds_control_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F814BE3169006EA2D5 /* nds_control_legacy.mm */; }; + ABE2410214BE3169006EA2D5 /* preferences_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FA14BE3169006EA2D5 /* preferences_legacy.mm */; }; + ABE2410314BE3169006EA2D5 /* screen_state_legacy.m in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FC14BE3169006EA2D5 /* screen_state_legacy.m */; }; + ABE2410414BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FE14BE3169006EA2D5 /* video_output_view_legacy.mm */; }; + ABE2410514BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F414BE3169006EA2D5 /* cocoa_input_legacy.mm */; }; + ABE2410614BE3169006EA2D5 /* input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F614BE3169006EA2D5 /* input_legacy.mm */; }; + ABE2410714BE3169006EA2D5 /* nds_control_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F814BE3169006EA2D5 /* nds_control_legacy.mm */; }; + ABE2410814BE3169006EA2D5 /* preferences_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FA14BE3169006EA2D5 /* preferences_legacy.mm */; }; + ABE2410914BE3169006EA2D5 /* screen_state_legacy.m in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FC14BE3169006EA2D5 /* screen_state_legacy.m */; }; + ABE2410A14BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FE14BE3169006EA2D5 /* video_output_view_legacy.mm */; }; + ABE2410B14BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F414BE3169006EA2D5 /* cocoa_input_legacy.mm */; }; + ABE2410C14BE3169006EA2D5 /* input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F614BE3169006EA2D5 /* input_legacy.mm */; }; + ABE2410D14BE3169006EA2D5 /* nds_control_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F814BE3169006EA2D5 /* nds_control_legacy.mm */; }; + ABE2410E14BE3169006EA2D5 /* preferences_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FA14BE3169006EA2D5 /* preferences_legacy.mm */; }; + ABE2410F14BE3169006EA2D5 /* screen_state_legacy.m in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FC14BE3169006EA2D5 /* screen_state_legacy.m */; }; + ABE2411014BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FE14BE3169006EA2D5 /* video_output_view_legacy.mm */; }; + ABE2411114BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F414BE3169006EA2D5 /* cocoa_input_legacy.mm */; }; + ABE2411214BE3169006EA2D5 /* input_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F614BE3169006EA2D5 /* input_legacy.mm */; }; + ABE2411314BE3169006EA2D5 /* nds_control_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240F814BE3169006EA2D5 /* nds_control_legacy.mm */; }; + ABE2411414BE3169006EA2D5 /* preferences_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FA14BE3169006EA2D5 /* preferences_legacy.mm */; }; + ABE2411514BE3169006EA2D5 /* screen_state_legacy.m in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FC14BE3169006EA2D5 /* screen_state_legacy.m */; }; + ABE2411614BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE240FE14BE3169006EA2D5 /* video_output_view_legacy.mm */; }; ABEFD81D14BB9E65004DB9DC /* Icon_VolumeFull_16x16.png in Resources */ = {isa = PBXBuildFile; fileRef = ABEFD81914BB9E65004DB9DC /* Icon_VolumeFull_16x16.png */; }; ABEFD81E14BB9E65004DB9DC /* Icon_VolumeMute_16x16.png in Resources */ = {isa = PBXBuildFile; fileRef = ABEFD81A14BB9E65004DB9DC /* Icon_VolumeMute_16x16.png */; }; ABEFD81F14BB9E65004DB9DC /* Icon_VolumeOneThird_16x16.png in Resources */ = {isa = PBXBuildFile; fileRef = ABEFD81B14BB9E65004DB9DC /* Icon_VolumeOneThird_16x16.png */; }; @@ -423,12 +429,6 @@ ABF4008114B4F1C000578AE7 /* sndOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF4007E14B4F1C000578AE7 /* sndOSX.cpp */; }; ABF4008214B4F1C000578AE7 /* sndOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF4007E14B4F1C000578AE7 /* sndOSX.cpp */; }; ABFE4242143E32F0009A3CCE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F4B55090F53924500C8B514 /* Localizable.strings */; }; - ABFE4247143E32F0009A3CCE /* screen_state.m in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4D135B8A4D00E977B3 /* screen_state.m */; }; - ABFE4248143E32F0009A3CCE /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4E135B8A4D00E977B3 /* cocoa_input.mm */; }; - ABFE4249143E32F0009A3CCE /* input.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB4F135B8A4D00E977B3 /* input.mm */; }; - ABFE424C143E32F0009A3CCE /* nds_control.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB52135B8A4D00E977B3 /* nds_control.mm */; }; - ABFE424D143E32F0009A3CCE /* preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB53135B8A4D00E977B3 /* preferences.mm */; }; - ABFE4250143E32F0009A3CCE /* video_output_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB06CB56135B8A4D00E977B3 /* video_output_view.mm */; }; ABFE4251143E32F0009A3CCE /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; ABFE4252143E32F0009A3CCE /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; ABFE4253143E32F0009A3CCE /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; @@ -534,7 +534,6 @@ 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 729BECE60D9D57F600ED561B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; 729BECEF0D9D581900ED561B /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; - 72C000010D9D59E60046B7EA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 72C000020D9D59E60046B7EA /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = ""; }; 7FA9121A1426523900E2ABDD /* tinystr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinystr.cpp; sourceTree = ""; }; 7FA9121B1426523900E2ABDD /* tinystr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinystr.h; sourceTree = ""; }; @@ -549,19 +548,7 @@ AB0191E714BD741F004CB612 /* Chinese */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Chinese; path = "translations/Chinese.lproj/MainMenu (Legacy).xib"; sourceTree = ""; }; AB0191E814BD7423004CB612 /* Norwegian */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Norwegian; path = "translations/Norwegian.lproj/MainMenu (Legacy).xib"; sourceTree = ""; }; AB0191E914BD7425004CB612 /* Romanian */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Romanian; path = "translations/Romanian.lproj/MainMenu (Legacy).xib"; sourceTree = ""; }; - AB06CB41135B8A4D00E977B3 /* cocoa_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_input.h; sourceTree = ""; }; - AB06CB43135B8A4D00E977B3 /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input.h; sourceTree = ""; }; - AB06CB45135B8A4D00E977B3 /* nds_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nds_control.h; sourceTree = ""; }; - AB06CB46135B8A4D00E977B3 /* preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preferences.h; sourceTree = ""; }; - AB06CB47135B8A4D00E977B3 /* screen_state.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_state.h; sourceTree = ""; }; AB06CB49135B8A4D00E977B3 /* sndOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sndOSX.h; sourceTree = ""; }; - AB06CB4A135B8A4D00E977B3 /* video_output_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video_output_view.h; sourceTree = ""; }; - AB06CB4D135B8A4D00E977B3 /* screen_state.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screen_state.m; sourceTree = ""; }; - AB06CB4E135B8A4D00E977B3 /* cocoa_input.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_input.mm; sourceTree = ""; }; - AB06CB4F135B8A4D00E977B3 /* input.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = input.mm; sourceTree = ""; }; - AB06CB52135B8A4D00E977B3 /* nds_control.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = nds_control.mm; sourceTree = ""; }; - AB06CB53135B8A4D00E977B3 /* preferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = preferences.mm; sourceTree = ""; }; - AB06CB56135B8A4D00E977B3 /* video_output_view.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = video_output_view.mm; sourceTree = ""; }; AB06CCD5135B8A9B00E977B3 /* DeSmuME_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeSmuME_Prefix.pch; sourceTree = ""; }; AB06CCD8135B8ACE00E977B3 /* addons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = addons.h; path = ../addons.h; sourceTree = SOURCE_ROOT; }; AB06CCD9135B8ACE00E977B3 /* agg2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = agg2d.h; path = ../agg2d.h; sourceTree = SOURCE_ROOT; }; @@ -758,7 +745,6 @@ AB06CE12135B8AED00E977B3 /* xstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xstring.h; sourceTree = ""; }; AB0A0D1D14AACACC00E83E91 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; AB0A0DAC14AACE9500E83E91 /* DeSmuME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DeSmuME.app; sourceTree = BUILT_PRODUCTS_DIR; }; - AB0A0DDE14AAD26600E83E91 /* Info (Debug).plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info (Debug).plist"; sourceTree = ""; }; AB0A0EA714AAF77000E83E91 /* README.MAC */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.MAC; path = ../../README.MAC; sourceTree = SOURCE_ROOT; }; AB0A0EA814AAF77000E83E91 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; sourceTree = SOURCE_ROOT; }; AB0A0EA914AAF77000E83E91 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ChangeLog; path = ../../ChangeLog; sourceTree = SOURCE_ROOT; }; @@ -787,6 +773,20 @@ ABBF04CD14B51BC900E505A0 /* Romanian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Romanian; path = translations/Romanian.lproj/Localizable.strings; sourceTree = ""; }; ABBF052F14B5436E00E505A0 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = ""; }; ABBF053B14B543B600E505A0 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = ""; }; + ABE240E514BE30FC006EA2D5 /* Info (Legacy Debug).plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info (Legacy Debug).plist"; sourceTree = ""; }; + ABE240E614BE30FC006EA2D5 /* Info (Legacy).plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info (Legacy).plist"; sourceTree = ""; }; + ABE240F314BE3169006EA2D5 /* cocoa_input_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_input_legacy.h; sourceTree = ""; }; + ABE240F414BE3169006EA2D5 /* cocoa_input_legacy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_input_legacy.mm; sourceTree = ""; }; + ABE240F514BE3169006EA2D5 /* input_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input_legacy.h; sourceTree = ""; }; + ABE240F614BE3169006EA2D5 /* input_legacy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = input_legacy.mm; sourceTree = ""; }; + ABE240F714BE3169006EA2D5 /* nds_control_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nds_control_legacy.h; sourceTree = ""; }; + ABE240F814BE3169006EA2D5 /* nds_control_legacy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = nds_control_legacy.mm; sourceTree = ""; }; + ABE240F914BE3169006EA2D5 /* preferences_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preferences_legacy.h; sourceTree = ""; }; + ABE240FA14BE3169006EA2D5 /* preferences_legacy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = preferences_legacy.mm; sourceTree = ""; }; + ABE240FB14BE3169006EA2D5 /* screen_state_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_state_legacy.h; sourceTree = ""; }; + ABE240FC14BE3169006EA2D5 /* screen_state_legacy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screen_state_legacy.m; sourceTree = ""; }; + ABE240FD14BE3169006EA2D5 /* video_output_view_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video_output_view_legacy.h; sourceTree = ""; }; + ABE240FE14BE3169006EA2D5 /* video_output_view_legacy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = video_output_view_legacy.mm; sourceTree = ""; }; ABEFD81914BB9E65004DB9DC /* Icon_VolumeFull_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_VolumeFull_16x16.png; path = images/Icon_VolumeFull_16x16.png; sourceTree = ""; }; ABEFD81A14BB9E65004DB9DC /* Icon_VolumeMute_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_VolumeMute_16x16.png; path = images/Icon_VolumeMute_16x16.png; sourceTree = ""; }; ABEFD81B14BB9E65004DB9DC /* Icon_VolumeOneThird_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_VolumeOneThird_16x16.png; path = images/Icon_VolumeOneThird_16x16.png; sourceTree = ""; }; @@ -859,23 +859,23 @@ ABF4007E14B4F1C000578AE7 /* sndOSX.cpp */, ABBF053B14B543B600E505A0 /* cocoa_file.h */, ABF95B4714B4F4FC007912B8 /* cocoa_globals.h */, - AB06CB41135B8A4D00E977B3 /* cocoa_input.h */, + ABE240F314BE3169006EA2D5 /* cocoa_input_legacy.h */, AB8FE37414B652EC009E20B1 /* cocoa_util.h */, - AB06CB43135B8A4D00E977B3 /* input.h */, + ABE240F514BE3169006EA2D5 /* input_legacy.h */, AB8FE30A14B647D6009E20B1 /* macosx_10_4_compat.h */, - AB06CB45135B8A4D00E977B3 /* nds_control.h */, - AB06CB46135B8A4D00E977B3 /* preferences.h */, - AB06CB47135B8A4D00E977B3 /* screen_state.h */, + ABE240F714BE3169006EA2D5 /* nds_control_legacy.h */, + ABE240F914BE3169006EA2D5 /* preferences_legacy.h */, + ABE240FB14BE3169006EA2D5 /* screen_state_legacy.h */, AB06CB49135B8A4D00E977B3 /* sndOSX.h */, - AB06CB4A135B8A4D00E977B3 /* video_output_view.h */, - AB06CB4D135B8A4D00E977B3 /* screen_state.m */, + ABE240FD14BE3169006EA2D5 /* video_output_view_legacy.h */, + ABE240FC14BE3169006EA2D5 /* screen_state_legacy.m */, ABBF052F14B5436E00E505A0 /* cocoa_file.mm */, - AB06CB4E135B8A4D00E977B3 /* cocoa_input.mm */, + ABE240F414BE3169006EA2D5 /* cocoa_input_legacy.mm */, AB8FE37514B652EC009E20B1 /* cocoa_util.mm */, - AB06CB4F135B8A4D00E977B3 /* input.mm */, - AB06CB52135B8A4D00E977B3 /* nds_control.mm */, - AB06CB53135B8A4D00E977B3 /* preferences.mm */, - AB06CB56135B8A4D00E977B3 /* video_output_view.mm */, + ABE240F614BE3169006EA2D5 /* input_legacy.mm */, + ABE240F814BE3169006EA2D5 /* nds_control_legacy.mm */, + ABE240FA14BE3169006EA2D5 /* preferences_legacy.mm */, + ABE240FE14BE3169006EA2D5 /* video_output_view_legacy.mm */, ); name = "Cocoa Port"; sourceTree = ""; @@ -1044,8 +1044,8 @@ AB4677FA14ABD4790002FF94 /* Images */, 1F4B55090F53924500C8B514 /* Localizable.strings */, AB0191D214BD72EC004CB612 /* MainMenu (Legacy).xib */, - 72C000010D9D59E60046B7EA /* Info.plist */, - AB0A0DDE14AAD26600E83E91 /* Info (Debug).plist */, + ABE240E514BE30FC006EA2D5 /* Info (Legacy Debug).plist */, + ABE240E614BE30FC006EA2D5 /* Info (Legacy).plist */, 72C000020D9D59E60046B7EA /* InfoPlist.strings */, AB0A0EA714AAF77000E83E91 /* README.MAC */, AB0A0EA814AAF77000E83E91 /* AUTHORS */, @@ -1372,7 +1372,7 @@ attributes = { ORGANIZATIONNAME = "DeSmuME Team"; }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME" */; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Legacy)" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -1702,16 +1702,16 @@ AB06CD9A135B8ACE00E977B3 /* wifi.cpp in Sources */, AB06CE96135B8AEE00E977B3 /* xstring.cpp in Sources */, ABAC890C14B7943E001B299F /* main.m in Sources */, - AB06CB65135B8A4D00E977B3 /* screen_state.m in Sources */, AB73B12F14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */, ABBF053314B5436E00E505A0 /* cocoa_file.mm in Sources */, - AB06CB66135B8A4D00E977B3 /* cocoa_input.mm in Sources */, AB8FE37914B652EC009E20B1 /* cocoa_util.mm in Sources */, AB73B13014BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */, - AB06CB67135B8A4D00E977B3 /* input.mm in Sources */, - AB06CB6A135B8A4D00E977B3 /* nds_control.mm in Sources */, - AB06CB6B135B8A4D00E977B3 /* preferences.mm in Sources */, - AB06CB6E135B8A4D00E977B3 /* video_output_view.mm in Sources */, + ABE2410B14BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */, + ABE2410C14BE3169006EA2D5 /* input_legacy.mm in Sources */, + ABE2410D14BE3169006EA2D5 /* nds_control_legacy.mm in Sources */, + ABE2410E14BE3169006EA2D5 /* preferences_legacy.mm in Sources */, + ABE2410F14BE3169006EA2D5 /* screen_state_legacy.m in Sources */, + ABE2411014BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1809,16 +1809,16 @@ AB06CD6B135B8ACE00E977B3 /* wifi.cpp in Sources */, AB06CE54135B8AEE00E977B3 /* xstring.cpp in Sources */, ABAC890914B7943E001B299F /* main.m in Sources */, - AB06CB59135B8A4D00E977B3 /* screen_state.m in Sources */, AB73B13114BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */, ABBF053014B5436E00E505A0 /* cocoa_file.mm in Sources */, - AB06CB5A135B8A4D00E977B3 /* cocoa_input.mm in Sources */, AB8FE37714B652EC009E20B1 /* cocoa_util.mm in Sources */, AB73B13214BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */, - AB06CB5B135B8A4D00E977B3 /* input.mm in Sources */, - AB06CB5E135B8A4D00E977B3 /* nds_control.mm in Sources */, - AB06CB5F135B8A4D00E977B3 /* preferences.mm in Sources */, - AB06CB62135B8A4D00E977B3 /* video_output_view.mm in Sources */, + ABE2411114BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */, + ABE2411214BE3169006EA2D5 /* input_legacy.mm in Sources */, + ABE2411314BE3169006EA2D5 /* nds_control_legacy.mm in Sources */, + ABE2411414BE3169006EA2D5 /* preferences_legacy.mm in Sources */, + ABE2411514BE3169006EA2D5 /* screen_state_legacy.m in Sources */, + ABE2411614BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1916,16 +1916,16 @@ AB0A0D6914AACE9500E83E91 /* wifi.cpp in Sources */, AB0A0D9814AACE9500E83E91 /* xstring.cpp in Sources */, ABAC890B14B7943E001B299F /* main.m in Sources */, - AB0A0D3C14AACE9500E83E91 /* screen_state.m in Sources */, AB73B12B14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */, ABBF053114B5436E00E505A0 /* cocoa_file.mm in Sources */, - AB0A0D3D14AACE9500E83E91 /* cocoa_input.mm in Sources */, AB8FE37614B652EC009E20B1 /* cocoa_util.mm in Sources */, AB73B12C14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */, - AB0A0D3E14AACE9500E83E91 /* input.mm in Sources */, - AB0A0D4114AACE9500E83E91 /* nds_control.mm in Sources */, - AB0A0D4214AACE9500E83E91 /* preferences.mm in Sources */, - AB0A0D4514AACE9500E83E91 /* video_output_view.mm in Sources */, + ABE240FF14BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */, + ABE2410014BE3169006EA2D5 /* input_legacy.mm in Sources */, + ABE2410114BE3169006EA2D5 /* nds_control_legacy.mm in Sources */, + ABE2410214BE3169006EA2D5 /* preferences_legacy.mm in Sources */, + ABE2410314BE3169006EA2D5 /* screen_state_legacy.m in Sources */, + ABE2410414BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2023,16 +2023,16 @@ ABFE4274143E32F0009A3CCE /* wifi.cpp in Sources */, ABFE42A3143E32F0009A3CCE /* xstring.cpp in Sources */, ABAC890A14B7943E001B299F /* main.m in Sources */, - ABFE4247143E32F0009A3CCE /* screen_state.m in Sources */, AB73B12D14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */, ABBF053214B5436E00E505A0 /* cocoa_file.mm in Sources */, - ABFE4248143E32F0009A3CCE /* cocoa_input.mm in Sources */, AB8FE37814B652EC009E20B1 /* cocoa_util.mm in Sources */, AB73B12E14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */, - ABFE4249143E32F0009A3CCE /* input.mm in Sources */, - ABFE424C143E32F0009A3CCE /* nds_control.mm in Sources */, - ABFE424D143E32F0009A3CCE /* preferences.mm in Sources */, - ABFE4250143E32F0009A3CCE /* video_output_view.mm in Sources */, + ABE2410514BE3169006EA2D5 /* cocoa_input_legacy.mm in Sources */, + ABE2410614BE3169006EA2D5 /* input_legacy.mm in Sources */, + ABE2410714BE3169006EA2D5 /* nds_control_legacy.mm in Sources */, + ABE2410814BE3169006EA2D5 /* preferences_legacy.mm in Sources */, + ABE2410914BE3169006EA2D5 /* screen_state_legacy.m in Sources */, + ABE2410A14BE3169006EA2D5 /* video_output_view_legacy.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2187,7 +2187,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IBC_STRIP_NIBS = NO; - INFOPLIST_FILE = "Info (Debug).plist"; + INFOPLIST_FILE = "Info (Legacy Debug).plist"; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; PRODUCT_NAME = "DeSmuME (Debug)"; @@ -2230,7 +2230,7 @@ "GCC_VERSION[sdk=macosx10.5][arch=ppc64]" = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = "Info (Legacy).plist"; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; PRODUCT_NAME = DeSmuME; @@ -2278,7 +2278,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME" */ = { + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Legacy)" */ = { isa = XCConfigurationList; buildConfigurations = ( C01FCF4F08A954540054247B /* Debug */, diff --git a/desmume/src/cocoa/Info (Debug).plist b/desmume/src/cocoa/Info (Legacy Debug).plist similarity index 100% rename from desmume/src/cocoa/Info (Debug).plist rename to desmume/src/cocoa/Info (Legacy Debug).plist diff --git a/desmume/src/cocoa/Info.plist b/desmume/src/cocoa/Info (Legacy).plist similarity index 100% rename from desmume/src/cocoa/Info.plist rename to desmume/src/cocoa/Info (Legacy).plist diff --git a/desmume/src/cocoa/cocoa_input.h b/desmume/src/cocoa/cocoa_input_legacy.h similarity index 100% rename from desmume/src/cocoa/cocoa_input.h rename to desmume/src/cocoa/cocoa_input_legacy.h diff --git a/desmume/src/cocoa/cocoa_input.mm b/desmume/src/cocoa/cocoa_input_legacy.mm similarity index 99% rename from desmume/src/cocoa/cocoa_input.mm rename to desmume/src/cocoa/cocoa_input_legacy.mm index 3f463cc33..b5c61cef9 100644 --- a/desmume/src/cocoa/cocoa_input.mm +++ b/desmume/src/cocoa/cocoa_input_legacy.mm @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import "cocoa_input.h" +#import "cocoa_input_legacy.h" #include "../NDSSystem.h" diff --git a/desmume/src/cocoa/input.h b/desmume/src/cocoa/input_legacy.h similarity index 100% rename from desmume/src/cocoa/input.h rename to desmume/src/cocoa/input_legacy.h diff --git a/desmume/src/cocoa/input.mm b/desmume/src/cocoa/input_legacy.mm similarity index 99% rename from desmume/src/cocoa/input.mm rename to desmume/src/cocoa/input_legacy.mm index 18749b785..f218601db 100644 --- a/desmume/src/cocoa/input.mm +++ b/desmume/src/cocoa/input_legacy.mm @@ -17,9 +17,9 @@ along with the this software. If not, see . */ -#import "input.h" -#import "cocoa_input.h" -#import "preferences.h" +#import "input_legacy.h" +#import "cocoa_input_legacy.h" +#import "preferences_legacy.h" static unsigned char utf8_return = 0x0D; static unsigned char utf8_right[3] = { 0xEF, 0x9C, 0x83 }; diff --git a/desmume/src/cocoa/nds_control.h b/desmume/src/cocoa/nds_control_legacy.h similarity index 100% rename from desmume/src/cocoa/nds_control.h rename to desmume/src/cocoa/nds_control_legacy.h diff --git a/desmume/src/cocoa/nds_control.mm b/desmume/src/cocoa/nds_control_legacy.mm similarity index 99% rename from desmume/src/cocoa/nds_control.mm rename to desmume/src/cocoa/nds_control_legacy.mm index 52bf2a8d6..97fb93a66 100644 --- a/desmume/src/cocoa/nds_control.mm +++ b/desmume/src/cocoa/nds_control_legacy.mm @@ -17,13 +17,13 @@ along with the this software. If not, see . */ -#import "nds_control.h" +#import "nds_control_legacy.h" #import "cocoa_globals.h" #import "cocoa_file.h" -#import "cocoa_input.h" #import "cocoa_util.h" -#import "preferences.h" -#import "screen_state.h" +#import "cocoa_input_legacy.h" +#import "preferences_legacy.h" +#import "screen_state_legacy.h" #include "sndOSX.h" #ifdef HAVE_OPENGL diff --git a/desmume/src/cocoa/preferences.h b/desmume/src/cocoa/preferences_legacy.h similarity index 100% rename from desmume/src/cocoa/preferences.h rename to desmume/src/cocoa/preferences_legacy.h diff --git a/desmume/src/cocoa/preferences.mm b/desmume/src/cocoa/preferences_legacy.mm similarity index 99% rename from desmume/src/cocoa/preferences.mm rename to desmume/src/cocoa/preferences_legacy.mm index e3a8a688c..7e4fcf8aa 100644 --- a/desmume/src/cocoa/preferences.mm +++ b/desmume/src/cocoa/preferences_legacy.mm @@ -17,9 +17,9 @@ along with the this software. If not, see . */ -#import "preferences.h" +#import "preferences_legacy.h" #import "cocoa_util.h" -#import "input.h" +#import "input_legacy.h" /* Preference settings are stored using NSUserDefaults which should put them in a property list in /Users/username/Library/Preferences diff --git a/desmume/src/cocoa/screen_state.h b/desmume/src/cocoa/screen_state_legacy.h similarity index 100% rename from desmume/src/cocoa/screen_state.h rename to desmume/src/cocoa/screen_state_legacy.h diff --git a/desmume/src/cocoa/screen_state.m b/desmume/src/cocoa/screen_state_legacy.m similarity index 99% rename from desmume/src/cocoa/screen_state.m rename to desmume/src/cocoa/screen_state_legacy.m index 4b5ddb691..a41ad2e4e 100644 --- a/desmume/src/cocoa/screen_state.m +++ b/desmume/src/cocoa/screen_state_legacy.m @@ -17,7 +17,7 @@ along with the this software. If not, see . */ -#import "screen_state.h" +#import "screen_state_legacy.h" #import "cocoa_util.h" @implementation ScreenState diff --git a/desmume/src/cocoa/userinterface/appDelegate_legacy.mm b/desmume/src/cocoa/userinterface/appDelegate_legacy.mm index 53f390291..b9cb98e3e 100644 --- a/desmume/src/cocoa/userinterface/appDelegate_legacy.mm +++ b/desmume/src/cocoa/userinterface/appDelegate_legacy.mm @@ -18,13 +18,13 @@ #import "appDelegate_legacy.h" #import "emuWindowDelegate_legacy.h" -#import "cocoa_input.h" +#import "cocoa_input_legacy.h" #import "cocoa_file.h" #import "cocoa_util.h" #import "cocoa_globals.h" -#import "nds_control.h" -#import "input.h" -#import "preferences.h" +#import "nds_control_legacy.h" +#import "input_legacy.h" +#import "preferences_legacy.h" #include "sndOSX.h" #undef BOOL diff --git a/desmume/src/cocoa/userinterface/emuWindowDelegate_legacy.mm b/desmume/src/cocoa/userinterface/emuWindowDelegate_legacy.mm index 7cb64cd76..7d343276f 100644 --- a/desmume/src/cocoa/userinterface/emuWindowDelegate_legacy.mm +++ b/desmume/src/cocoa/userinterface/emuWindowDelegate_legacy.mm @@ -20,9 +20,9 @@ #import "cocoa_file.h" #import "cocoa_globals.h" #import "cocoa_util.h" -#import "video_output_view.h" -#import "nds_control.h" -#import "input.h" +#import "video_output_view_legacy.h" +#import "nds_control_legacy.h" +#import "input_legacy.h" @implementation EmuWindowDelegate diff --git a/desmume/src/cocoa/video_output_view.h b/desmume/src/cocoa/video_output_view_legacy.h similarity index 100% rename from desmume/src/cocoa/video_output_view.h rename to desmume/src/cocoa/video_output_view_legacy.h diff --git a/desmume/src/cocoa/video_output_view.mm b/desmume/src/cocoa/video_output_view_legacy.mm similarity index 98% rename from desmume/src/cocoa/video_output_view.mm rename to desmume/src/cocoa/video_output_view_legacy.mm index 81b3bc4fa..c621a4a40 100644 --- a/desmume/src/cocoa/video_output_view.mm +++ b/desmume/src/cocoa/video_output_view_legacy.mm @@ -17,14 +17,14 @@ along with the this software. If not, see . */ -#import "video_output_view.h" -#import "nds_control.h" -#import "input.h" -#import "cocoa_input.h" +#import "video_output_view_legacy.h" #import "cocoa_globals.h" #import "cocoa_util.h" -#import "preferences.h" -#import "screen_state.h" +#import "nds_control_legacy.h" +#import "input_legacy.h" +#import "cocoa_input_legacy.h" +#import "preferences_legacy.h" +#import "screen_state_legacy.h" #include "../GPU.h" #include "../NDSSystem.h"