ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux compilation fix 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4868 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2011-08-12 18:25:21 +00:00
parent 94e79f781d
commit 136300ab2e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/Utilities/Threading.h
View File

@ -408,7 +408,11 @@ namespace Threading
ScopedLock m_lock; ScopedLock m_lock;
volatile __aligned(4) bool& m_bool; volatile __aligned(4) bool& m_bool;
#ifdef __LINUX__
ScopedLockBool(Mutex& mutexToLock, volatile bool& isLockedBool)
#else
ScopedLockBool(Mutex& mutexToLock, volatile __aligned(4) bool& isLockedBool) ScopedLockBool(Mutex& mutexToLock, volatile __aligned(4) bool& isLockedBool)
#endif
: m_lock(mutexToLock), : m_lock(mutexToLock),
m_bool(isLockedBool) { m_bool(isLockedBool) {
m_bool = m_lock.IsLocked(); m_bool = m_lock.IsLocked();

2
pcsx2/CMakeLists.txt
View File

@ -141,6 +141,7 @@ set(pcsx2Sources
Memory.cpp Memory.cpp
MMI.cpp MMI.cpp
MTGS.cpp MTGS.cpp
MTVU.cpp
Patch.cpp Patch.cpp
Patch_Memory.cpp Patch_Memory.cpp
Pcsx2Config.cpp Pcsx2Config.cpp
@ -205,6 +206,7 @@ set(pcsx2Headers
IopMem.h IopMem.h
IopSio2.h IopSio2.h
# Mdec.h # Mdec.h
MTVU.h
Memory.h Memory.h
MemoryTypes.h MemoryTypes.h
NakedAsm.h NakedAsm.h

2
pcsx2/VU1microInterp.cpp
View File

@ -178,7 +178,7 @@ void InterpVU1::Reset() {
vu1Thread.WaitVU(); vu1Thread.WaitVU();
} }
void InterpVU1::Shutdown() { void InterpVU1::Shutdown() throw() {
vu1Thread.WaitVU(); vu1Thread.WaitVU();
} }