mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +01:00
Linux compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2804 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
f2a7da4611
commit
6b2b1a34ee
@ -43,11 +43,7 @@ public:
|
||||
virtual bool usesMixer() const { return true; }
|
||||
virtual void Update();
|
||||
|
||||
#ifdef _WIN32
|
||||
static DWORD WINAPI ThreadFunc(void* args);
|
||||
#else
|
||||
static void* soundThread(void* args);
|
||||
#endif
|
||||
static THREAD_RETURN ThreadFunc(void* args);
|
||||
|
||||
private:
|
||||
Common::Thread *thread;
|
||||
|
@ -2,8 +2,10 @@
|
||||
#define ALDEVICELIST_H
|
||||
|
||||
#include "CommonTypes.h"
|
||||
|
||||
#pragma warning(disable: 4786) //disable warning "identifier was truncated to '255' characters in the browser information"
|
||||
#ifdef _WIN32
|
||||
#pragma warning(disable: 4786) //disable warning "identifier was truncated to
|
||||
//'255' characters in the browser information"
|
||||
#endif
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
|
||||
# -*- python -*-
|
||||
|
||||
Import('env')
|
||||
@ -26,6 +27,7 @@ files = [
|
||||
"main.cpp",
|
||||
"opcodes.cpp",
|
||||
"Tools.cpp",
|
||||
"Debugger/Debugger.cpp",
|
||||
"Logging/AXTask.cpp",
|
||||
"Logging/Logging.cpp",
|
||||
"Logging/ReadPBs.cpp",
|
||||
|
@ -34,7 +34,6 @@
|
||||
|
||||
#if defined(HAVE_WX) && HAVE_WX
|
||||
#include "DSPConfigDlgLLE.h"
|
||||
#include "debugger/Debugger.h"
|
||||
#include "Debugger/Debugger.h" // For the CDebugger class
|
||||
CDebugger* m_frame = NULL;
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user