From e4a57202d258d3ab85b28ea7ecc51842ac1ca6f7 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Mon, 13 Jul 2009 07:31:43 +0000 Subject: [PATCH] Some Fixes, compile fix in Linux. Comments, etc git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3777 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Atomic_GCC.h | 6 ++--- Source/Core/Core/Src/PowerPC/PPCTables.cpp | 4 ++-- Source/Core/DolphinWX/Src/MainNoGUI.cpp | 17 ++++++++++++++ Source/Core/InputCommon/Src/X11InputBase.cpp | 24 ++++++++++++++++++-- Source/Core/InputCommon/Src/X11InputBase.h | 20 ++++++++++++++++ 5 files changed, 64 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/Atomic_GCC.h b/Source/Core/Common/Src/Atomic_GCC.h index 5d1057e931..9ab8b97ae6 100644 --- a/Source/Core/Common/Src/Atomic_GCC.h +++ b/Source/Core/Common/Src/Atomic_GCC.h @@ -38,11 +38,11 @@ namespace Common { 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) { - __sync_add_and_fetch(target, 1); + __sync_add_and_fetch(&target, 1); } 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. } inline void AtomicStoreRelease(volatile u32& dest, u32 value) { - __sync_lock_test_and_set(dest, value); + __sync_lock_test_and_set(&dest, value); } } diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp index 2979d1c9e0..95f26d3c4a 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp @@ -23,7 +23,7 @@ #include "StringUtil.h" #include "Interpreter/Interpreter.h" #include "Interpreter/Interpreter_Tables.h" -#ifndef NOJIT +#if !(defined(NOJIT) && NOJIT) #include "JitCommon/Jit_Tables.h" #if defined(_M_IX86) || defined(_M_X64) @@ -160,7 +160,7 @@ void InitTables() { // Interpreter ALWAYS needs to be initialized InterpreterTables::InitTables(); - #ifndef NOJIT + #if !(defined(NOJIT) && NOJIT) // Should be able to do this a better way than defines in this function JitTables::InitTables(); #endif diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp index 2138cda02b..dc4b6c39c2 100644 --- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp @@ -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 #include #include diff --git a/Source/Core/InputCommon/Src/X11InputBase.cpp b/Source/Core/InputCommon/Src/X11InputBase.cpp index 6013e2f983..32512d9307 100644 --- a/Source/Core/InputCommon/Src/X11InputBase.cpp +++ b/Source/Core/InputCommon/Src/X11InputBase.cpp @@ -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 @@ -5,8 +21,7 @@ #include namespace InputCommon { -#ifdef HAVE_WX -#include +#if defined(HAVE_WX) && HAVE_WX // Taken from wxw source code KeySym wxCharCodeWXToX(int id) { @@ -89,6 +104,11 @@ KeySym wxCharCodeWXToX(int id) return keySym; } +#else +KeySym wxCharCodeWXToX(int id) +{ + return NULL; +} #endif void XKeyToString(unsigned int keycode, char *keyStr) { switch (keycode) { diff --git a/Source/Core/InputCommon/Src/X11InputBase.h b/Source/Core/InputCommon/Src/X11InputBase.h index 55e382cef9..aaa14a36ca 100644 --- a/Source/Core/InputCommon/Src/X11InputBase.h +++ b/Source/Core/InputCommon/Src/X11InputBase.h @@ -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 #define XINPUTBASE_H #include #include +#include "Config.h" +#if defined(HAVE_WX) && HAVE_WX +#include +#endif namespace InputCommon { KeySym wxCharCodeWXToX(int id);