diff --git a/SConstruct b/SConstruct index 6a26eaba74..73d5683168 100644 --- a/SConstruct +++ b/SConstruct @@ -121,7 +121,7 @@ if sys.platform == 'darwin': ccld += ['--sysroot=/Developer/SDKs/MacOSX10.5.sdk'] system = '/System/Library/Frameworks' env['CCFLAGS'] += ccld - env['CCFLAGS'] += ['-msse3'] + env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3'] env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.5.sdk' + system] env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system] env['CC'] = "gcc-4.2 -ObjC" diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp index 0c9db6f04f..ab30645ac3 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.cpp +++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp @@ -136,6 +136,8 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc) void OnPixelFormatChange(const BPCmd &bp) { + int convtype = -1; + /* * When changing the EFB format, the pixel data won't get converted to the new format but stays the same. * Since we are always using an RGBA8 buffer though, this causes issues in some games. @@ -145,14 +147,13 @@ void OnPixelFormatChange(const BPCmd &bp) !g_ActiveConfig.backend_info.bSupportsFormatReinterpretation) return; - int new_format = bpmem.zcontrol.pixel_format; - int old_format = Renderer::GetPrevPixelFormat(); + unsigned int new_format = bpmem.zcontrol.pixel_format; + unsigned int old_format = Renderer::GetPrevPixelFormat(); // no need to reinterpret pixel data in these cases if (new_format == old_format || old_format == (unsigned int)-1) goto skip; - int convtype = -1; switch (old_format) { case PIXELFMT_RGB8_Z24: diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 551d87eb11..fffde7b7b2 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -677,4 +677,4 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, entry->FromRenderTarget(bFromZBuffer, bScaleByHalf, cbufid, colmat, source_rect, bIsIntensityFmt, copyfmt); g_renderer->RestoreAPIState(); -} \ No newline at end of file +}