Linux compile fix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2804 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-30 16:30:31 +00:00
parent f2a7da4611
commit 6b2b1a34ee
6 changed files with 14 additions and 15 deletions

View File

@ -43,11 +43,7 @@ public:
virtual bool usesMixer() const { return true; } virtual bool usesMixer() const { return true; }
virtual void Update(); virtual void Update();
#ifdef _WIN32 static THREAD_RETURN ThreadFunc(void* args);
static DWORD WINAPI ThreadFunc(void* args);
#else
static void* soundThread(void* args);
#endif
private: private:
Common::Thread *thread; Common::Thread *thread;

View File

@ -2,8 +2,10 @@
#define ALDEVICELIST_H #define ALDEVICELIST_H
#include "CommonTypes.h" #include "CommonTypes.h"
#ifdef _WIN32
#pragma warning(disable: 4786) //disable warning "identifier was truncated to '255' characters in the browser information" #pragma warning(disable: 4786) //disable warning "identifier was truncated to
//'255' characters in the browser information"
#endif
#include <vector> #include <vector>
#include <string> #include <string>

View File

@ -1,3 +1,4 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
@ -10,8 +11,8 @@ if not env['HAVE_AO']:
Return() Return()
files = [ files = [
"Config.cpp", "Config.cpp",
"DSPConfigDlgLLE.cpp", "DSPConfigDlgLLE.cpp",
"disassemble.cpp", "disassemble.cpp",
"gdsp_aram.cpp", "gdsp_aram.cpp",
"gdsp_ext_op.cpp", "gdsp_ext_op.cpp",
@ -21,14 +22,15 @@ files = [
"gdsp_opcodes.cpp", "gdsp_opcodes.cpp",
"gdsp_registers.cpp", "gdsp_registers.cpp",
"Globals.cpp", "Globals.cpp",
"HLE_Functions.cpp", "HLE_Functions.cpp",
"HLE_Helper.cpp", "HLE_Helper.cpp",
"main.cpp", "main.cpp",
"opcodes.cpp", "opcodes.cpp",
"Tools.cpp", "Tools.cpp",
"Logging/AXTask.cpp", "Debugger/Debugger.cpp",
"Logging/Logging.cpp", "Logging/AXTask.cpp",
"Logging/ReadPBs.cpp", "Logging/Logging.cpp",
"Logging/ReadPBs.cpp",
] ]
lleenv = env.Clone() lleenv = env.Clone()

View File

@ -34,7 +34,6 @@
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "DSPConfigDlgLLE.h" #include "DSPConfigDlgLLE.h"
#include "debugger/Debugger.h"
#include "Debugger/Debugger.h" // For the CDebugger class #include "Debugger/Debugger.h" // For the CDebugger class
CDebugger* m_frame = NULL; CDebugger* m_frame = NULL;
#endif #endif