From c4c16fcfd47d147bcad25ad6a2fe21e3596b38c7 Mon Sep 17 00:00:00 2001
From: gecko_reverse <gecko_reverse@users.sf.net>
Date: Sun, 12 Oct 2008 23:19:20 +0000
Subject: [PATCH] moved cocoa rom_info to cocoa/dialogs. also removed ctrlsdl
 from codeblocks project (added accidentally last revision)

---
 desmume/src/cocoa/DeSmuME.cbp                 | 12 +++---
 .../cocoa/DeSmuME.xcodeproj/project.pbxproj   | 38 +++++++++----------
 desmume/src/cocoa/{ => dialogs}/rom_info.h    |  0
 desmume/src/cocoa/{ => dialogs}/rom_info.m    |  2 +-
 desmume/src/cocoa/main_window.m               |  2 +-
 5 files changed, 26 insertions(+), 28 deletions(-)
 rename desmume/src/cocoa/{ => dialogs}/rom_info.h (100%)
 rename desmume/src/cocoa/{ => dialogs}/rom_info.m (99%)

diff --git a/desmume/src/cocoa/DeSmuME.cbp b/desmume/src/cocoa/DeSmuME.cbp
index c15f346a1..8f8f7bc2d 100644
--- a/desmume/src/cocoa/DeSmuME.cbp
+++ b/desmume/src/cocoa/DeSmuME.cbp
@@ -127,6 +127,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA]]>
 			<Option compile="1" />
 			<Option link="1" />
 		</Unit>
+		<Unit filename="dialogs/rom_info.h" />
+		<Unit filename="dialogs/rom_info.m">
+			<Option compile="1" />
+			<Option link="1" />
+		</Unit>
 		<Unit filename="dialogs/speed_limit_selection_window.h" />
 		<Unit filename="dialogs/speed_limit_selection_window.m">
 			<Option compile="1" />
@@ -157,11 +162,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA]]>
 			<Option compile="1" />
 			<Option link="1" />
 		</Unit>
-		<Unit filename="rom_info.h" />
-		<Unit filename="rom_info.m">
-			<Option compile="1" />
-			<Option link="1" />
-		</Unit>
 		<Unit filename="screen_state.h" />
 		<Unit filename="screen_state.m">
 			<Option compile="1" />
@@ -184,10 +184,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA]]>
 		</Unit>
 		<Unit filename="../common.cpp" />
 		<Unit filename="../common.h" />
-		<Unit filename="../config.h" />
 		<Unit filename="../cp15.cpp" />
 		<Unit filename="../cp15.h" />
-		<Unit filename="../ctrlssdl.cpp" />
 		<Unit filename="../ctrlssdl.h" />
 		<Unit filename="../debug.cpp" />
 		<Unit filename="../debug.h" />
diff --git a/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj
index ff4ac4bc1..069841b03 100644
--- a/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj
+++ b/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		721F43D20EA2A18F0037FB33 /* rtc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 721F43C90EA2A18F0037FB33 /* rtc.cpp */; };
 		721F43D30EA2A18F0037FB33 /* softrender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 721F43CB0EA2A18F0037FB33 /* softrender.cpp */; };
 		721F43E50EA2A23F0037FB33 /* sndOSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = 721F43E40EA2A23F0037FB33 /* sndOSX.mm */; };
+		721F44230EA2BB6E0037FB33 /* rom_info.m in Sources */ = {isa = PBXBuildFile; fileRef = 721F44220EA2BB6E0037FB33 /* rom_info.m */; };
 		722764620E78E18100AEDC8B /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7227644A0E78E18100AEDC8B /* arm_instructions.cpp */; };
 		722764630E78E18100AEDC8B /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7227644B0E78E18100AEDC8B /* armcpu.cpp */; };
 		722764640E78E18100AEDC8B /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7227644C0E78E18100AEDC8B /* bios.cpp */; };
@@ -49,7 +50,6 @@
 		729BEC740D9D55DB00ED561B /* main_window.m in Sources */ = {isa = PBXBuildFile; fileRef = 729BEC620D9D55DB00ED561B /* main_window.m */; };
 		729BEC750D9D55DB00ED561B /* nds_control.mm in Sources */ = {isa = PBXBuildFile; fileRef = 729BEC640D9D55DB00ED561B /* nds_control.mm */; };
 		729BEC760D9D55DB00ED561B /* preferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 729BEC660D9D55DB00ED561B /* preferences.m */; };
-		729BEC770D9D55DB00ED561B /* rom_info.m in Sources */ = {isa = PBXBuildFile; fileRef = 729BEC680D9D55DB00ED561B /* rom_info.m */; };
 		729BEC780D9D55DB00ED561B /* screenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 729BEC6A0D9D55DB00ED561B /* screenshot.m */; };
 		729BEC7A0D9D55DB00ED561B /* video_output_view.m in Sources */ = {isa = PBXBuildFile; fileRef = 729BEC6E0D9D55DB00ED561B /* video_output_view.m */; };
 		729BECE70D9D57F600ED561B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 729BECE60D9D57F600ED561B /* OpenGL.framework */; };
@@ -76,6 +76,8 @@
 		721F43CF0EA2A18F0037FB33 /* softrender_v3sysfont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = softrender_v3sysfont.h; path = ../softrender_v3sysfont.h; sourceTree = SOURCE_ROOT; };
 		721F43D00EA2A18F0037FB33 /* zero_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zero_private.h; path = ../zero_private.h; sourceTree = SOURCE_ROOT; };
 		721F43E40EA2A23F0037FB33 /* sndOSX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = sndOSX.mm; sourceTree = "<group>"; };
+		721F44210EA2BB6E0037FB33 /* rom_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rom_info.h; path = dialogs/rom_info.h; sourceTree = "<group>"; };
+		721F44220EA2BB6E0037FB33 /* rom_info.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = rom_info.m; path = dialogs/rom_info.m; sourceTree = "<group>"; };
 		7227644A0E78E18100AEDC8B /* arm_instructions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arm_instructions.cpp; path = ../arm_instructions.cpp; sourceTree = SOURCE_ROOT; };
 		7227644B0E78E18100AEDC8B /* armcpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = armcpu.cpp; path = ../armcpu.cpp; sourceTree = SOURCE_ROOT; };
 		7227644C0E78E18100AEDC8B /* bios.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bios.cpp; path = ../bios.cpp; sourceTree = SOURCE_ROOT; };
@@ -124,8 +126,6 @@
 		729BEC640D9D55DB00ED561B /* nds_control.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = nds_control.mm; sourceTree = "<group>"; };
 		729BEC650D9D55DB00ED561B /* preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preferences.h; sourceTree = SOURCE_ROOT; };
 		729BEC660D9D55DB00ED561B /* preferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = preferences.m; sourceTree = SOURCE_ROOT; };
-		729BEC670D9D55DB00ED561B /* rom_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rom_info.h; sourceTree = SOURCE_ROOT; };
-		729BEC680D9D55DB00ED561B /* rom_info.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = rom_info.m; sourceTree = SOURCE_ROOT; };
 		729BEC690D9D55DB00ED561B /* screenshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screenshot.h; sourceTree = SOURCE_ROOT; };
 		729BEC6A0D9D55DB00ED561B /* screenshot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screenshot.m; sourceTree = SOURCE_ROOT; };
 		729BEC6B0D9D55DB00ED561B /* sndOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sndOSX.h; sourceTree = SOURCE_ROOT; };
@@ -186,6 +186,7 @@
 			isa = PBXGroup;
 			children = (
 				72D219C40E6B4DDF00439B28 /* Dialogs */,
+				721F43E40EA2A23F0037FB33 /* sndOSX.mm */,
 				72D89DE30E83973A008D9B64 /* screen_state.h */,
 				72D89DE40E83973A008D9B64 /* screen_state.m */,
 				7277B8EA0D9F25F700D283BD /* about.m */,
@@ -200,8 +201,6 @@
 				729BEC640D9D55DB00ED561B /* nds_control.mm */,
 				729BEC650D9D55DB00ED561B /* preferences.h */,
 				729BEC660D9D55DB00ED561B /* preferences.m */,
-				729BEC670D9D55DB00ED561B /* rom_info.h */,
-				729BEC680D9D55DB00ED561B /* rom_info.m */,
 				729BEC690D9D55DB00ED561B /* screenshot.h */,
 				729BEC6A0D9D55DB00ED561B /* screenshot.m */,
 				729BEC6B0D9D55DB00ED561B /* sndOSX.h */,
@@ -239,19 +238,6 @@
 		29B97314FDCFA39411CA2CEA /* DeSmuME */ = {
 			isa = PBXGroup;
 			children = (
-				721F43E40EA2A23F0037FB33 /* sndOSX.mm */,
-				721F43C50EA2A18F0037FB33 /* common.cpp */,
-				721F43C60EA2A18F0037FB33 /* common.h */,
-				721F43C70EA2A18F0037FB33 /* memorystream.h */,
-				721F43C80EA2A18F0037FB33 /* readwrite.h */,
-				721F43C90EA2A18F0037FB33 /* rtc.cpp */,
-				721F43CA0EA2A18F0037FB33 /* rtc.h */,
-				721F43CB0EA2A18F0037FB33 /* softrender.cpp */,
-				721F43CC0EA2A18F0037FB33 /* softrender.h */,
-				721F43CD0EA2A18F0037FB33 /* softrender_config.h */,
-				721F43CE0EA2A18F0037FB33 /* softrender_desmumefont.h */,
-				721F43CF0EA2A18F0037FB33 /* softrender_v3sysfont.h */,
-				721F43D00EA2A18F0037FB33 /* zero_private.h */,
 				729BECEF0D9D581900ED561B /* AudioUnit.framework */,
 				729BECE60D9D57F600ED561B /* OpenGL.framework */,
 				080E96DDFE201D6D7F000001 /* Cocoa Port */,
@@ -266,6 +252,18 @@
 		29B97315FDCFA39411CA2CEA /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				721F43C50EA2A18F0037FB33 /* common.cpp */,
+				721F43C60EA2A18F0037FB33 /* common.h */,
+				721F43C70EA2A18F0037FB33 /* memorystream.h */,
+				721F43C80EA2A18F0037FB33 /* readwrite.h */,
+				721F43C90EA2A18F0037FB33 /* rtc.cpp */,
+				721F43CA0EA2A18F0037FB33 /* rtc.h */,
+				721F43CB0EA2A18F0037FB33 /* softrender.cpp */,
+				721F43CC0EA2A18F0037FB33 /* softrender.h */,
+				721F43CD0EA2A18F0037FB33 /* softrender_config.h */,
+				721F43CE0EA2A18F0037FB33 /* softrender_desmumefont.h */,
+				721F43CF0EA2A18F0037FB33 /* softrender_v3sysfont.h */,
+				721F43D00EA2A18F0037FB33 /* zero_private.h */,
 				72D89E360E845C7E008D9B64 /* readwrite.cpp */,
 				728E5E200E7F54CC00608344 /* GPU_osd.h */,
 				7248E45E0E7E0B0E004DCFFE /* gfx3d.cpp */,
@@ -353,6 +351,8 @@
 		72D219C40E6B4DDF00439B28 /* Dialogs */ = {
 			isa = PBXGroup;
 			children = (
+				721F44210EA2BB6E0037FB33 /* rom_info.h */,
+				721F44220EA2BB6E0037FB33 /* rom_info.m */,
 				723395580E596E9100999693 /* speed_limit_selection_window.h */,
 				723395590E596E9100999693 /* speed_limit_selection_window.m */,
 			);
@@ -449,7 +449,6 @@
 				729BEC740D9D55DB00ED561B /* main_window.m in Sources */,
 				729BEC750D9D55DB00ED561B /* nds_control.mm in Sources */,
 				729BEC760D9D55DB00ED561B /* preferences.m in Sources */,
-				729BEC770D9D55DB00ED561B /* rom_info.m in Sources */,
 				729BEC780D9D55DB00ED561B /* screenshot.m in Sources */,
 				729BEC7A0D9D55DB00ED561B /* video_output_view.m in Sources */,
 				7277B8EB0D9F25F700D283BD /* about.m in Sources */,
@@ -483,6 +482,7 @@
 				721F43D20EA2A18F0037FB33 /* rtc.cpp in Sources */,
 				721F43D30EA2A18F0037FB33 /* softrender.cpp in Sources */,
 				721F43E50EA2A23F0037FB33 /* sndOSX.mm in Sources */,
+				721F44230EA2BB6E0037FB33 /* rom_info.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/desmume/src/cocoa/rom_info.h b/desmume/src/cocoa/dialogs/rom_info.h
similarity index 100%
rename from desmume/src/cocoa/rom_info.h
rename to desmume/src/cocoa/dialogs/rom_info.h
diff --git a/desmume/src/cocoa/rom_info.m b/desmume/src/cocoa/dialogs/rom_info.m
similarity index 99%
rename from desmume/src/cocoa/rom_info.m
rename to desmume/src/cocoa/dialogs/rom_info.m
index dbb2e427d..1a7cfcfdc 100644
--- a/desmume/src/cocoa/rom_info.m
+++ b/desmume/src/cocoa/dialogs/rom_info.m
@@ -18,7 +18,7 @@
 */
 
 #import "rom_info.h"
-#import "nds_control.h"
+#import "../nds_control.h"
 
 bool leopard_or_later = false;
 int HUDWindowMask = 1 << 13; //this is NSHUDWindowMask from Leopard, defined here so we can mantain tiger compile compatability
diff --git a/desmume/src/cocoa/main_window.m b/desmume/src/cocoa/main_window.m
index 418e8486d..44eb554a7 100644
--- a/desmume/src/cocoa/main_window.m
+++ b/desmume/src/cocoa/main_window.m
@@ -23,8 +23,8 @@
 #import "screen_state.h"
 #import "video_output_view.h"
 #import "input.h"
-#import "rom_info.h"
 #import "preferences.h"
+#import "dialogs/rom_info.h"
 #import "dialogs/speed_limit_selection_window.h"
 
 //How much padding to put around the video output