Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
2025-07-23 06:09:50 -06:00 · 2008-10-04 17:26:12 +00:00
parent 59b115d197
commit c7ae1fd402
20 changed files with 102 additions and 139 deletions
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@ -24,16 +24,15 @@
 #define CHECK_HEAP_INTEGRITY()

 #ifdef _WIN32
-	#define USE_WX // Always define in Windows since it isn't tested.
-	#ifdef _DEBUG
-		#include <crtdbg.h>
-		#undef CHECK_HEAP_INTEGRITY
-		#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
-	#endif
+#ifdef _DEBUG
+#include <crtdbg.h>
+#undef CHECK_HEAP_INTEGRITY
+#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
+#endif

-	#include "../../../PluginSpecs/CommonTypes.h"
+#include "../../../PluginSpecs/CommonTypes.h"
 #else
-	#include "CommonTypes.h"
+#include "CommonTypes.h"
 #endif

 #include <stdlib.h>
@ -42,45 +41,45 @@

 // Function Cross-Compatibility
 #ifdef _WIN32
-	#define strcasecmp _stricmp
-	#define unlink _unlink
+#define strcasecmp _stricmp
+#define unlink _unlink
 #else
-	#define _stricmp strcasecmp
-	#define _unlink unlink
+#define _stricmp strcasecmp
+#define _unlink unlink
 #endif

 #ifdef _WIN32
-	#ifdef _WIN32
-		#define fseek _fseeki64
-		#define ftell _ftelli64
-	#endif
+#ifdef _WIN32
+#define fseek _fseeki64
+#define ftell _ftelli64
+#endif

-	#define POSIX 0
-	#define NOMINMAX
+#define POSIX 0
+#define NOMINMAX

-	#if _M_IX86
-		#define Crash() {__asm int 3}
-	#else
-		#if _MSC_VER > 1000
-			extern "C" {
-				__declspec(dllimport) void __stdcall DebugBreak(void);
-			}
-			#define Crash() {DebugBreak();}
-		#else
-			#error fixme
-		#endif
-	#endif
+#if _M_IX86
+#define Crash() {__asm int 3}
+#else
+#if _MSC_VER > 1000
+extern "C" {
+	__declspec(dllimport) void __stdcall DebugBreak(void);
+}
+#define Crash() {DebugBreak();}
+#else
+#error fixme
+#endif
+#endif

 #elif __GNUC__
-	#define POSIX 1
-	#define MAX_PATH 260
-	#define stricmp strcasecmp
-	#define Crash() {asm ("int $3");}
-	#ifdef _LP64
-		#define _M_X64 1
-	#else
-		#define _M_IX86 1
-	#endif
+#define POSIX 1
+#define MAX_PATH 260
+#define stricmp strcasecmp
+#define Crash() {asm ("int $3");}
+#ifdef _LP64
+#define _M_X64 1
+#else
+#define _M_IX86 1
+#endif
 #endif

 // Alignment
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@ -27,20 +27,15 @@
 #include "VolumeCreator.h"
 #include "Config.h"
 #include "Core.h"
-
-#ifdef USE_WX
 #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";

-#ifdef USE_WX
 extern CFrame* main_frame;
 extern CCodeWindow* g_pCodeWindow;
-#endif

 namespace BootManager
 {
@ -51,8 +46,7 @@ extern "C" HINSTANCE wxGetInstance();
 bool BootCore(const std::string& _rFilename)
 {
 	SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
-	
-	#ifdef USE_WX
+
 	if (g_pCodeWindow)
 	{
 //		StartUp.bUseDualCore = code_frame->UseDualCore();
@ -63,16 +57,11 @@ bool BootCore(const std::string& _rFilename)
 //		StartUp.bUseDualCore = false;
 //		StartUp.bUseJIT = true;
 	}
-	#endif
 	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
 	StartUp.m_strFilename = _rFilename;
 	StartUp.bRunCompareClient = false;
 	StartUp.bRunCompareServer = false;
-	#ifdef USE_WX
 	StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
-	#else
-	StartUp.bEnableDebugging = false;
-	#endif
 	std::string BaseDataPath;
 #ifdef _WIN32
 	StartUp.hInstance = wxGetInstance();
@ -95,10 +84,8 @@ bool BootCore(const std::string& _rFilename)
 		ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
 		ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
 	}
-	#ifdef USE_WX
 	if(main_frame)
 		StartUp.hMainWindow = main_frame->GetRenderHandle();
-	#endif

 	// init the core
 	if (!Core::Init(StartUp))
@ -106,12 +93,8 @@ bool BootCore(const std::string& _rFilename)
 		PanicAlert("Couldn't init the core.\nCheck your configuration.");
 		return(false);
 	}
-	
-	#ifdef USE_WX
+
 	Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
-	#else
-	Core::SetState(Core::CORE_RUN);
-	#endif
 	return(true);
 }

--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@ -78,7 +78,7 @@ enum
 	ID_TOOLBAR = 500,
 	LIST_CTRL = 1000
 };
-#ifdef USE_WX
+
 #define wxUSE_XPM_IN_MSW 1
 #define USE_XPM_BITMAPS 1

@ -125,5 +125,5 @@ enum
 		),

 extern const wxEventType wxEVT_HOST_COMMAND;
-#endif
+
 #endif
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ b/Source/Core/DolphinWX/Src/ISOFile.cpp
@ -67,7 +67,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
 					pBannerLoader->GetDescription(m_Description);
 					if (pBannerLoader->GetBanner(g_ImageTemp))
 					{
-						#ifdef USE_WX
 						unsigned char* pImage = (unsigned char*)malloc(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT * 3);

 						for (size_t i = 0; i < DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT; i++)
@ -78,7 +77,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
 						}

 						m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, pImage);
-						#endif
 					}
 				}
 				else
--- a/Source/Core/DolphinWX/Src/ISOFile.h
+++ b/Source/Core/DolphinWX/Src/ISOFile.h
@ -36,9 +36,7 @@ public:
 	bool IsCompressed() const {return m_BlobCompressed;}
 	u64 GetFileSize() const {return m_FileSize;}
 	u64 GetVolumeSize() const {return m_VolumeSize;}
-	#ifdef USE_WX
 	const wxImage& GetImage() const {return m_Image;}
-	#endif

 private:
 	std::string m_FileName;
@ -52,9 +50,7 @@ private:

 	DiscIO::IVolume::ECountry m_Country;

-	#ifdef USE_WX
 	wxImage m_Image;
-	#endif

 	bool m_Valid;

--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@ -1,7 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
-
 #ifndef _WIN32
 //#include <curses.h>
 #else
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@ -6,19 +6,22 @@ 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',
 	]
 libs = [
-	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
+	'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
 	]
-if not env['nowx']:
-	files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
-	libs += ['debwx', ]

 wxenv = env.Clone()
 wxenv.Append(
@ -27,7 +30,7 @@ wxenv.Append(
 		'wxNEEDS_CHARPP',
 		],
 	LINKFLAGS = [
-		'-lpthread',
+		'-pthread',
 		],
 	LIBS = libs
 	)
@ -61,6 +64,5 @@ else:
 	exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'

 objects = [ wxenv.Object(srcFile) for srcFile in files ]
-if not env['nowx']:
-	wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])	
+wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
 wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])