piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be a little more careful about the use of SSE.

Browse Source 
We really need to adopt the GCC model of one instruction set
per compilation unit.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6965 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-29 11:40:20 +00:00
parent d5e5730fef
commit 1287a9bb9f
5 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SConstruct
View File

@ -121,6 +121,7 @@ if sys.platform == 'darwin':
env['CCFLAGS'] += ccld env['CCFLAGS'] += ccld
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof'] env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic'] env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3']
env['CC'] = 'llvm-gcc' env['CC'] = 'llvm-gcc'
env['CXX'] = 'llvm-g++' env['CXX'] = 'llvm-g++'
env['CXXFLAGS'] += ['-x', 'objective-c++'] env['CXXFLAGS'] += ['-x', 'objective-c++']
@ -330,8 +331,14 @@ dirs = [
'Externals/SFML/src', 'Externals/SFML/src',
#'Externals/wxWidgets', #'Externals/wxWidgets',
'Externals/zlib', 'Externals/zlib',
'Source/Plugins/Plugin_VideoOGL/Src', ]
#'Source/Plugins/Plugin_VideoSoftware/Src',
if sys.platform == 'darwin':
dirs += ['Source/Plugins/Plugin_VideoOGL/Src']
else:
dirs += ['Source/Plugins/Plugin_VideoSoftware/Src']
dirs += [
'Source/Core/AudioCommon/Src', 'Source/Core/AudioCommon/Src',
'Source/Core/Common/Src', 'Source/Core/Common/Src',
'Source/Core/Core/Src', 'Source/Core/Core/Src',

10
Source/Core/Common/Src/Common.h
View File

@ -149,11 +149,13 @@ private:
// wxWidgets does not have a true dummy macro for this. // wxWidgets does not have a true dummy macro for this.
#define _trans(a) a #define _trans(a) a
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || defined __APPLE__ #if defined __APPLE__ && defined __i386__
#define _M_SSE 0x300
#elif defined __APPLE__ && defined __x86_64__
#define _M_SSE 0x301 #define _M_SSE 0x301
#endif #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
#define _M_SSE 0x301
#if _MSC_VER >= 1500 // Visual Studio 2008 #elif _MSC_VER >= 1500 // Visual Studio 2008
#define _M_SSE 0x401 #define _M_SSE 0x401
#endif #endif

13
Source/Core/Core/Src/SConscript
View File

@ -160,18 +160,13 @@ files = [
"PowerPC/Jit64/Jit64_Tables.cpp", "PowerPC/Jit64/Jit64_Tables.cpp",
] ]
libs = [
'bdisasm',
'inputcommon',
'lua',
'sfml-network',
]
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp", "HW/WiimoteReal/IOWin.cpp" ] files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp", "HW/WiimoteReal/IOWin.cpp" ]
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
files += [ "HW/BBA-TAP/TAP_Apple.cpp", "HW/WiimoteReal/IOdarwin.mm" ] files += [ "HW/BBA-TAP/TAP_Apple.cpp", "HW/WiimoteReal/IOdarwin.mm" ]
else: elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IONix.cpp" ] files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IONix.cpp" ]
else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs) env.StaticLibrary(env['local_libs'] + 'core', files)

7
Source/Core/DebuggerWX/Src/SConscript
View File

@ -20,9 +20,4 @@ files = [
"JitWindow.cpp", "JitWindow.cpp",
] ]
libs = [ env.StaticLibrary(env['local_libs'] + "debwx", files)
'common',
'debugger_ui_util'
]
env.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs)

6
Source/Core/DiscIO/Src/SConscript
View File

@ -26,8 +26,4 @@ files = [
'WiiWad.cpp', 'WiiWad.cpp',
] ]
libs = [ env.StaticLibrary(env['local_libs'] + 'discio', files)
'common'
]
env.StaticLibrary(env['local_libs'] + 'discio', files, LIBS = libs)