Some Fixes, compile fix in Linux. Comments, etc
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3777 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
4cfcf9bdd5
commit
e4a57202d2
|
@ -38,11 +38,11 @@ namespace Common
|
||||||
{
|
{
|
||||||
|
|
||||||
inline void AtomicAdd(volatile u32& target, u32 value) {
|
inline void AtomicAdd(volatile u32& target, u32 value) {
|
||||||
__sync_add_and_fetch(target, value);
|
__sync_add_and_fetch(&target, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void AtomicIncrement(volatile u32& target) {
|
inline void AtomicIncrement(volatile u32& target) {
|
||||||
__sync_add_and_fetch(target, 1);
|
__sync_add_and_fetch(&target, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline u32 AtomicLoad(volatile u32& src) {
|
inline u32 AtomicLoad(volatile u32& src) {
|
||||||
|
@ -57,7 +57,7 @@ inline void AtomicStore(volatile u32& dest, u32 value) {
|
||||||
dest = value; // 32-bit writes are always atomic.
|
dest = value; // 32-bit writes are always atomic.
|
||||||
}
|
}
|
||||||
inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
|
inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
|
||||||
__sync_lock_test_and_set(dest, value);
|
__sync_lock_test_and_set(&dest, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include "StringUtil.h"
|
#include "StringUtil.h"
|
||||||
#include "Interpreter/Interpreter.h"
|
#include "Interpreter/Interpreter.h"
|
||||||
#include "Interpreter/Interpreter_Tables.h"
|
#include "Interpreter/Interpreter_Tables.h"
|
||||||
#ifndef NOJIT
|
#if !(defined(NOJIT) && NOJIT)
|
||||||
#include "JitCommon/Jit_Tables.h"
|
#include "JitCommon/Jit_Tables.h"
|
||||||
|
|
||||||
#if defined(_M_IX86) || defined(_M_X64)
|
#if defined(_M_IX86) || defined(_M_X64)
|
||||||
|
@ -160,7 +160,7 @@ void InitTables()
|
||||||
{
|
{
|
||||||
// Interpreter ALWAYS needs to be initialized
|
// Interpreter ALWAYS needs to be initialized
|
||||||
InterpreterTables::InitTables();
|
InterpreterTables::InitTables();
|
||||||
#ifndef NOJIT
|
#if !(defined(NOJIT) && NOJIT)
|
||||||
// Should be able to do this a better way than defines in this function
|
// Should be able to do this a better way than defines in this function
|
||||||
JitTables::InitTables();
|
JitTables::InitTables();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,3 +1,20 @@
|
||||||
|
// Copyright (C) 2003-2008 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
|
@ -1,3 +1,19 @@
|
||||||
|
// Copyright (C) 2003-2008 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
#include "X11InputBase.h"
|
#include "X11InputBase.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -5,8 +21,7 @@
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
namespace InputCommon
|
namespace InputCommon
|
||||||
{
|
{
|
||||||
#ifdef HAVE_WX
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
#include <wx/wx.h>
|
|
||||||
// Taken from wxw source code
|
// Taken from wxw source code
|
||||||
KeySym wxCharCodeWXToX(int id)
|
KeySym wxCharCodeWXToX(int id)
|
||||||
{
|
{
|
||||||
|
@ -89,6 +104,11 @@ KeySym wxCharCodeWXToX(int id)
|
||||||
|
|
||||||
return keySym;
|
return keySym;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
KeySym wxCharCodeWXToX(int id)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
void XKeyToString(unsigned int keycode, char *keyStr) {
|
void XKeyToString(unsigned int keycode, char *keyStr) {
|
||||||
switch (keycode) {
|
switch (keycode) {
|
||||||
|
|
|
@ -1,9 +1,29 @@
|
||||||
|
// Copyright (C) 2003-2008 Dolphin Project.
|
||||||
|
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, version 2.0.
|
||||||
|
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License 2.0 for more details.
|
||||||
|
|
||||||
|
// A copy of the GPL 2.0 should have been included with the program.
|
||||||
|
// If not, see http://www.gnu.org/licenses/
|
||||||
|
|
||||||
|
// Official SVN repository and contact information can be found at
|
||||||
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
#ifndef XINPUTBASE_H
|
#ifndef XINPUTBASE_H
|
||||||
#define XINPUTBASE_H
|
#define XINPUTBASE_H
|
||||||
|
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
|
#include "Config.h"
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
|
#include <wx/wx.h>
|
||||||
|
#endif
|
||||||
namespace InputCommon
|
namespace InputCommon
|
||||||
{
|
{
|
||||||
KeySym wxCharCodeWXToX(int id);
|
KeySym wxCharCodeWXToX(int id);
|
||||||
|
|
Loading…
Reference in New Issue