diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-09 08:51:57 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-09 08:51:57 +0000 |
| commit | e1eb51a01034348f3eeb94f2e951a1665b5c641b (patch) | |
| tree | 129c37e9191527adb7770cbeeb8f1fc26721b72d /Source/Core/Common/Src | |
| parent | c343b8b8bbd39b748fa4b17ace1027490de18e70 (diff) | |
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
Diffstat (limited to 'Source/Core/Common/Src')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 5 | ||||
| -rw-r--r-- | Source/Core/Common/Src/SConscript | 1 | ||||
| -rw-r--r-- | Source/Core/Common/Src/StringUtil.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Thread.cpp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 43ca8d25e1..234334d3c6 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -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)
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 9bc27b69c4..67d7218da5 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -22,6 +22,7 @@ files = [ "Thunk.cpp", "Timer.cpp", "Thread.cpp", + "WaveFile.cpp", "x64Emitter.cpp", "x64Analyzer.cpp", ] diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 2a3345f512..133d2fb515 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.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
diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index db02b4598e..7254caf539 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -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
}
|