first step to get dolphin on osx 64 with a no wx version (WIP)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@924 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/BootManager.cpp

@@ -27,15 +27,19 @@
 #include "VolumeCreator.h"
 #include "Config.h"
 #include "Core.h"
+#if !defined(_LP64) && !defined(__APPLE__)
 #include "Frame.h"
 #include "CodeWindow.h"
+#endif
 
 static std::string s_DataBasePath_EUR = "Data_EUR";
 static std::string s_DataBasePath_USA = "Data_USA";
 static std::string s_DataBasePath_JAP = "Data_JAP";
 
+#if !defined(_LP64) && !defined(__APPLE__)
 extern CFrame* main_frame;
 extern CCodeWindow* g_pCodeWindow;
+#endif
 
 namespace BootManager
 {
@@ -47,6 +51,7 @@ bool BootCore(const std::string& _rFilename)
 {
 	SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
 
+#if !defined(_LP64) && !defined(__APPLE__)
 	if (g_pCodeWindow)
 	{
 //		StartUp.bUseDualCore = code_frame->UseDualCore();
@@ -57,12 +62,15 @@ bool BootCore(const std::string& _rFilename)
 //		StartUp.bUseDualCore = false;
 //		StartUp.bUseJIT = true;
 	}
+#endif //osx 64
 	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
 	StartUp.m_strFilename = _rFilename;
 	SConfig::GetInstance().m_LastFilename = StartUp.m_strFilename;
 	StartUp.bRunCompareClient = false;
 	StartUp.bRunCompareServer = false;
+#if !defined(_LP64) && !defined(__APPLE__)
 	StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
+#endif //osx 64
 	std::string BaseDataPath;
 #ifdef _WIN32
 	StartUp.hInstance = wxGetInstance();
@@ -85,9 +93,10 @@ bool BootCore(const std::string& _rFilename)
 		ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
 		ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
 	}
+#if !defined(_LP64) && !defined(__APPLE__)
 	if(main_frame)
 		StartUp.hMainWindow = main_frame->GetRenderHandle();
-
+#endif
 	// init the core
 	if (!Core::Init(StartUp))
 	{
@@ -95,7 +104,11 @@ bool BootCore(const std::string& _rFilename)
 		return(false);
 	}
 
+#if !defined(_LP64) && !defined(__APPLE__)
 	Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
+#else
+	Core::SetState(Core::CORE_RUN);
+#endif
 	return(true);
 }
 

Source/Core/DolphinWX/Src/Globals.h

@@ -86,6 +86,7 @@ enum
 //#include <wx/wxprec.h>
 
 //#ifndef WX_PRECOMP
+#if !defined(_LP64) && !defined(__APPLE__)
 #include <wx/wx.h>
 //#endif
 
@@ -125,5 +126,5 @@ enum
 		),
 
 extern const wxEventType wxEVT_HOST_COMMAND;
-
+#endif //apple 64bit
 #endif

Source/Core/DolphinWX/Src/ISOFile.h

@@ -36,7 +36,9 @@ public:
 	bool IsCompressed() const {return m_BlobCompressed;}
 	u64 GetFileSize() const {return m_FileSize;}
 	u64 GetVolumeSize() const {return m_VolumeSize;}
+#if !defined(_LP64) && !defined(__APPLE__)
 	const wxImage& GetImage() const {return m_Image;}
+#endif
 
 private:
 	std::string m_FileName;
@@ -50,8 +52,9 @@ private:
 
 	DiscIO::IVolume::ECountry m_Country;
 
+#if !defined(_LP64) && !defined(__APPLE__)
 	wxImage m_Image;
-
+#endif
 	bool m_Valid;
 
 	bool m_BlobCompressed;

Source/Core/DolphinWX/Src/MainNoGUI.cpp

@@ -78,8 +78,9 @@ void Host_SysMessage(const char *fmt, ...)
 }
 
 // Include SDL header so it can hijack main().
+#if !defined(_LP64) && !defined(__APPLE__)
 #include <SDL.h>
-
+#endif
 int main(int argc, char* argv[])
 {
 	gengetopt_args_info args_info;

Source/Core/DolphinWX/Src/SConscript

@@ -6,23 +6,33 @@ import sys
 files = [
 	'BootManager.cpp',
 	'Config.cpp',
-	'ConfigMain.cpp',
-	'FileSearch.cpp',
-	'FilesystemViewer.cpp',
-	'Frame.cpp',
-	'GameListCtrl.cpp',
-	'Globals.cpp',
-	'ISOFile.cpp',
-	'MemcardManager.cpp',
-	'MemoryCards/GCMemcard.cpp',
-	'PluginManager.cpp',
-	'stdafx.cpp',
 	'cmdline.c',
 	]
+
+if not env['osx64']:
+    files += 	[
+		'ConfigMain.cpp',
+       		'FileSearch.cpp',
+       		'FilesystemViewer.cpp',
+       		'Frame.cpp',
+       		'GameListCtrl.cpp',
+       		'Globals.cpp',
+       		'ISOFile.cpp',
+       		'MemcardManager.cpp',
+       		'MemoryCards/GCMemcard.cpp',
+       		'PluginManager.cpp',
+       		'stdafx.cpp',
+		]
+
+
 libs = [
-	'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
+	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
 	]
 
+if not env['osx64']:
+    libs += 	[
+		'debwx'
+		]
 wxenv = env.Clone()
 wxenv.Append(
 	CPPDEFINES = [
@@ -64,5 +74,6 @@ else:
 	exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
 
 objects = [ wxenv.Object(srcFile) for srcFile in files ]
-wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
+if not env['osx64']:
+    wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
 wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])