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

Drop support for building on OS X 10.5. It is too much hassle to 

work around the limitations of the no longer maintained Xcode 3.1.4
for Leopard. Running a 10.6-built app on 10.5 works fine through
through the use of the 10.5 SDK.

std::locale() seems to be the generally safer way to specify the
default locale and works on Linux and OS X at least. Thanks to
dasmetzelmaennchen for the pointer.

Remove some obsolete SCons related svn:ignores.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6893 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-22 02:18:25 +00:00
parent 17d9888f3c
commit 392a589092
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/CLRun/include/OpenCL/cl.h vendored
View File

@ -1 +0,0 @@
#include <CL/cl.h>

1
Externals/CLRun/include/OpenCL/cl_platform.h vendored
View File

@ -1 +0,0 @@
#include <CL/cl_platform.h>

17
SConstruct
View File

@ -121,17 +121,18 @@ if sys.platform == 'darwin':
ccld += ['--sysroot=/Developer/SDKs/MacOSX10.5.sdk'] ccld += ['--sysroot=/Developer/SDKs/MacOSX10.5.sdk']
system = '/System/Library/Frameworks' system = '/System/Library/Frameworks'
env['CCFLAGS'] += ccld env['CCFLAGS'] += ccld
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3'] env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3']
env['CCFLAGS'] += ['-mtune=core2', '-Xarch_x86_64', '-march=core2'] env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
env['CCFLAGS'] += ['-mdynamic-no-pic']
env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.5.sdk' + system] env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.5.sdk' + system]
env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system] env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system]
env['CC'] = "gcc-4.2 -ObjC" env['CC'] = '/Developer/usr/bin/llvm-gcc -ObjC'
env['CXX'] = "g++-4.2 -ObjC++" env['CXX'] = '/Developer/usr/bin/llvm-g++ -ObjC++'
env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices'] env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices']
env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio', 'WebKit'] env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio', 'WebKit']
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL'] env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
env['FRAMEWORKSFLAGS'] = ['-Xarch_i386', '-Wl,-framework,QuickTime'] env['FRAMEWORKSFLAGS'] = ['-weak_framework', 'OpenCL']
env['FRAMEWORKSFLAGS'] += ['-Xarch_i386', '-Wl,-framework,QuickTime']
env['LIBPATH'] += ['/usr/lib'] env['LIBPATH'] += ['/usr/lib']
env['LINKFLAGS'] += ccld env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z', '-F' + system] env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z', '-F' + system]
@ -139,12 +140,6 @@ if sys.platform == 'darwin':
env['SHLINKFLAGS'] += ['-Wl,-undefined,dynamic_lookup'] env['SHLINKFLAGS'] += ['-Wl,-undefined,dynamic_lookup']
env['SHLINKFLAGS'] += ['-Xarch_i386', '-Wl,-read_only_relocs,suppress'] env['SHLINKFLAGS'] += ['-Xarch_i386', '-Wl,-read_only_relocs,suppress']
if platform.mac_ver()[0] >= '10.6.0':
env['CC'] = "llvm-gcc-4.2 -ObjC"
env['CXX'] = "llvm-g++-4.2 -ObjC++"
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
env['FRAMEWORKSFLAGS'] += ['-weak_framework', 'OpenCL']
if env['nowx']: if env['nowx']:
env['HAVE_WX'] = 0 env['HAVE_WX'] = 0
else: else:

4
Source/Core/Common/Src/StringUtil.h
View File

@ -52,9 +52,7 @@ template <typename I>
std::string ThousandSeparate(I value, int spaces = 0) std::string ThousandSeparate(I value, int spaces = 0)
{ {
std::ostringstream oss; std::ostringstream oss;
#ifndef __APPLE__ // XXX oss.imbue(std::locale());
oss.imbue(std::locale(""));
#endif
oss << std::setw(spaces) << value; oss << std::setw(spaces) << value;
return oss.str(); return oss.str();