Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again

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

Source/Core/DolphinWX/Src/BootManager.cpp

@@ -27,15 +27,20 @@
 #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
 {
@@ -46,7 +51,8 @@ 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();
@@ -57,11 +63,16 @@ 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();
@@ -84,8 +95,10 @@ 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))
@@ -93,8 +106,12 @@ 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);
 }
 

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

Source/Core/DolphinWX/Src/ISOFile.cpp

@@ -67,6 +67,7 @@ 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++)
@@ -77,6 +78,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
 						}
 
 						m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, pImage);
+						#endif
 					}
 				}
 				else

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;}
+	#ifdef USE_WX
 	const wxImage& GetImage() const {return m_Image;}
+	#endif
 
 private:
 	std::string m_FileName;
@@ -50,7 +52,9 @@ private:
 
 	DiscIO::IVolume::ECountry m_Country;
 
+	#ifdef USE_WX
 	wxImage m_Image;
+	#endif
 
 	bool m_Valid;
 

Source/Core/DolphinWX/Src/MainNoGUI.cpp

@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
+
 #ifndef _WIN32
 //#include <curses.h>
 #else

Source/Core/DolphinWX/Src/SConscript

@@ -6,22 +6,19 @@ 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 = [
-	'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
+	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
 	]
+if not env['nowx']:
+	files.Append['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
+	libs.Append['debwx', ]
 
 wxenv = env.Clone()
 wxenv.Append(
@@ -30,7 +27,7 @@ wxenv.Append(
 		'wxNEEDS_CHARPP',
 		],
 	LINKFLAGS = [
-		'-pthread',
+		'-lpthread',
 		],
 	LIBS = libs
 	)
@@ -64,5 +61,6 @@ else:
 	exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
 
 objects = [ wxenv.Object(srcFile) for srcFile in files ]
-wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
+if not env['nowx']:
+	wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])	
 wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])