mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 22:29:39 -06:00
Fix Building in Linux, removed the define for _T() in Common.h so now we can have wx headers after including Common.h. Also, InterlockedExchange isn't in Linux so I just made it assign the variable
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@809 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -116,11 +116,6 @@ typedef union _LARGE_INTEGER
|
||||
#ifndef __forceinline
|
||||
#define __forceinline inline
|
||||
#endif
|
||||
|
||||
#ifndef _T
|
||||
#define _T(a) a
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#if defined (_M_IX86) && defined (_WIN32)
|
||||
|
@ -22,6 +22,7 @@ files = [
|
||||
"Thunk.cpp",
|
||||
"Timer.cpp",
|
||||
"Thread.cpp",
|
||||
"WaveFile.cpp",
|
||||
"x64Emitter.cpp",
|
||||
"x64Analyzer.cpp",
|
||||
]
|
||||
|
@ -387,7 +387,7 @@ void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _P
|
||||
// check for seperator
|
||||
if (_CompleteFilename[_CompleteFilename.size() - 1] != '\\')
|
||||
{
|
||||
_CompleteFilename += _T("\\");
|
||||
_CompleteFilename += "\\";
|
||||
}
|
||||
|
||||
// add the filename
|
||||
|
@ -350,7 +350,7 @@ int InterlockedExchangeAdd(int *Addend, int Increment)
|
||||
#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__))
|
||||
return __sync_add_and_fetch(Addend, Increment);
|
||||
#else
|
||||
#error Sorry - GCC versions that don't support __sync_add_and_fetch are not supported.
|
||||
#error Sorry - GCC versions that does not support __sync_add_and_fetch are not supported.
|
||||
// TODO support old gcc
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user