piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Intel Macs: Provides fixes to help compile on Macs, thanks to tmator

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@104 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-07-30 09:12:52 +00:00
parent 19f3c986ff
commit 92c0a4c370
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/MappedFile.cpp
View File

@ -17,7 +17,7 @@
#ifdef _WIN32
#include <windows.h>
#elif __linux__
#else
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>

4
Source/Core/Common/Src/MemoryUtil.cpp
View File

@ -26,6 +26,10 @@
#include <stdio.h>
#endif
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
#define MAP_ANONYMOUS MAP_ANON
#endif
// MacOSX does not support MAP_VARIABLE
#ifndef MAP_VARIABLE
#define MAP_VARIABLE 0

10
Source/Core/DolphinWX/src/SConscript
View File

@ -1,4 +1,5 @@
Import('env')
import sys
files = ["BootManager.cpp",
"Config.cpp",
@ -13,7 +14,12 @@ files = ["BootManager.cpp",
"PluginOptions.cpp",
"stdafx.cpp",
]
wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP",
LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs`")
wxenv.Program("../../../../Binary/linux/Dolphin", files, LIBS = ["debwx", "discio", "core", "bdisasm", "videocommon", "common"])
if sys.platform == 'darwin':
wxenv.Program("../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin", files, LIBS = ["debwx", "discio", "core", "bdisasm", "videocommon", "common" , "z"])
else:
wxenv.Program("../../../../Binary/linux/Dolphin", files, LIBS = ["debwx", "discio", "core", "bdisasm", "videocommon", "common"])