diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-23 08:49:58 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-23 08:49:58 +0000 |
| commit | 1d175eadd7eed113a3050fc4ffa9bb521fb614ca (patch) | |
| tree | 9d531ceff4325efc7174f41e6f2b05b7a8be8831 /Source/Core | |
| parent | f9582bef302ac9354c348bc88efb16fdf8b783a1 (diff) | |
Linux: Fixes so it compiles in 32bit. Now a Config dialog for the video plugin, Linux only, if you want to change for Windows, work on it
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@61 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/MemArena.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/Common/Src/SConscript | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index 4455f99004..11a87d524c 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -64,8 +64,11 @@ void* MemArena::CreateView(s64 offset, size_t size, bool ensure_low_mem) #else
void* ptr = mmap(0, size,
PROT_READ | PROT_WRITE,
- MAP_SHARED | (ensure_low_mem ? MAP_32BIT : 0),
- fd, offset);
+ MAP_SHARED
+#ifdef __x86_64__
+ | (ensure_low_mem ? MAP_32BIT : 0)
+#endif
+ , fd, offset);
if (!ptr)
{
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 5974faabff..d14efd2c5d 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -21,6 +21,7 @@ files = ["Common.cpp", "x64Emitter.cpp", "x64Analyzer.cpp", ] - -env_common = env.Copy(CXXFLAGS = " -fPIC ") + +env_common = env.Copy() +env_common.Append(CXXFLAGS = " -fPIC ") env_common.StaticLibrary("common", files) |