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

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SConstruct
View File

@ -1,7 +1,11 @@
import os import os
import sys
ccflags = '-g -O3 -fno-strict-aliasing -fPIC -msse2 -Wall -DLOGGING -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE' ccflags = '-g -O3 -fno-strict-aliasing -fPIC -msse2 -Wall -DLOGGING -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE'
if sys.platform == 'darwin':
ccflags += ' -I/opt/local/include'
if False: if False:
ccflags += ' -fomit-frame-pointer' ccflags += ' -fomit-frame-pointer'
@ -16,7 +20,22 @@ include_paths = ["../../../Core/Common/Src",
# "../../../Plugins/Plugin_VideoOGL/Src/Windows", # "../../../Plugins/Plugin_VideoOGL/Src/Windows",
] ]
dirs = ["Source/Core/Common/Src", if sys.platform == 'darwin':
dirs = ["Source/Core/Common/Src",
"Externals/Bochs_disasm",
"Source/Core/Core/Src",
"Source/Core/DiscIO/Src",
"Source/Core/DebuggerWX/src",
"Source/Core/VideoCommon/Src",
# "Source/Plugins/Plugin_VideoOGL/Src",
"Source/Plugins/Plugin_DSP_NULL/Src",
# "Source/Plugins/Plugin_DSP_LLE/Src",
# "Source/Plugins/Plugin_PadSimple/Src",
"Source/Plugins/Plugin_nJoy_SDL/Src",
"Source/Core/DolphinWX/src",
]
else:
dirs = ["Source/Core/Common/Src",
"Externals/Bochs_disasm", "Externals/Bochs_disasm",
"Source/Core/Core/Src", "Source/Core/Core/Src",
"Source/Core/DiscIO/Src", "Source/Core/DiscIO/Src",
@ -30,6 +49,7 @@ dirs = ["Source/Core/Common/Src",
"Source/Core/DolphinWX/src", "Source/Core/DolphinWX/src",
] ]
lib_paths = include_paths lib_paths = include_paths
env = Environment(CC="gcc", env = Environment(CC="gcc",

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

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

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

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

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

@ -1,4 +1,5 @@
Import('env') Import('env')
import sys
files = ["BootManager.cpp", files = ["BootManager.cpp",
"Config.cpp", "Config.cpp",
@ -13,7 +14,12 @@ files = ["BootManager.cpp",
"PluginOptions.cpp", "PluginOptions.cpp",
"stdafx.cpp", "stdafx.cpp",
] ]
wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP", wxenv = env.Copy(CXXFLAGS = "`wx-config --cppflags` -DUSE_XPM_BITMAPS -DwxNEEDS_CHARPP",
LINKFLAGS = "-L/usr/local/lib -pthread `wx-config --libs`") 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"])