From 8c41d31651924e7cab5123eedfd5d994e672acbe Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 8 Feb 2011 11:02:34 +0000 Subject: [PATCH] Fix Plugin_VideoSoftware build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7113 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/SConscript | 3 ++- Source/Core/Common/Src/VideoBackendBase.cpp | 4 ---- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 4 +--- Source/Core/DolphinWX/Src/SConscript | 7 +++++-- Source/Core/VideoCommon/Src/DLCache.cpp | 19 +++++++++---------- .../Plugin_VideoSoftware/Src/SWmain.cpp | 4 +++- .../Plugin_VideoSoftware/Src/VideoBackend.h | 1 + 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 5027f7d9f6..d2dfd8832e 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -38,7 +38,7 @@ files = [ "Thunk.cpp", "Timer.cpp", "Version.cpp", - "VideoBackendBase.cpp", + #"VideoBackendBase.cpp", "x64Emitter.cpp", "x64Analyzer.cpp", "Crypto/aes_cbc.cpp", @@ -56,3 +56,4 @@ if sys.platform == 'win32': env['common'] = env.StaticObject(files) env['CPPPATH'] += ['.'] env['LIBS'] += env['common'] +env['LIBS'] += env.StaticObject('VideoBackendBase.cpp') diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index e49b1c8bf0..090875d89b 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -23,9 +23,7 @@ #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" #endif #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" -#ifndef _WIN32 // XXX #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h" -#endif std::vector g_available_video_backends; VideoBackend* g_video_backend = NULL; @@ -38,9 +36,7 @@ void VideoBackend::PopulateList() g_available_video_backends.push_back(new DX11::VideoBackend); #endif g_available_video_backends.push_back(new OGL::VideoBackend); -#ifndef _WIN32 // XXX g_available_video_backends.push_back(new SW::VideoBackend); -#endif g_video_backend = g_available_video_backends.front(); } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 25c1297887..0c2f742987 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -1,5 +1,3 @@ -#import -extern "C" OSErr UpdateSystemActivity(UInt8 activity); #define BLUETOOTH_VERSION_USE_CURRENT #import @@ -72,7 +70,7 @@ extern "C" OSErr UpdateSystemActivity(UInt8 activity); (void)wm->Read(); - (void)UpdateSystemActivity(1); + (void)UpdateSystemActivity(UsrActivity); } - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index bdafb3206d..67181e1f34 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -50,13 +50,16 @@ elif sys.platform == 'darwin': env['FRAMEWORKPATH'] += ['Externals/Cg'] frameworksflags += ['-Wl,-weak_framework,Cg'] frameworksflags += ['-Wl,-weak_framework,OpenCL'] - frameworksflags += ['-Wl,-weak_framework,QuickTime'] - frameworksflags += ['-Wl,-no_arch_warnings'] exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin' if env['HAVE_WX']: env['LIBS'] += env['wxconfiglibs'] + frameworksflags += ['-Wl,-weak_framework,AudioToolbox'] + frameworksflags += ['-Wl,-weak_framework,Carbon'] + frameworksflags += ['-Wl,-weak_framework,QuickTime'] + frameworksflags += ['-Wl,-weak_framework,WebKit'] + frameworksflags += ['-Wl,-no_arch_warnings'] else: env['LIBS'] += ['iconv'] exe += 'NoGUI' diff --git a/Source/Core/VideoCommon/Src/DLCache.cpp b/Source/Core/VideoCommon/Src/DLCache.cpp index e58fe5cbab..d7cd27952b 100644 --- a/Source/Core/VideoCommon/Src/DLCache.cpp +++ b/Source/Core/VideoCommon/Src/DLCache.cpp @@ -43,7 +43,7 @@ #define DL_CODE_CACHE_SIZE (1024*1024*16) #define DL_CODE_CLEAR_THRESHOLD (128 * 1024) extern int frameCount; -static int CheckContextId; +static u32 CheckContextId; using namespace Gen; namespace DLCache @@ -66,11 +66,11 @@ struct ReferencedDataRegion ReferencedDataRegion() :hash(0), start_address(NULL), + NextRegion(NULL), size(0), - MustClean(false), + MustClean(0), ReferencedArray(-1), - ReferencedArrayStride(0), - NextRegion(NULL) + ReferencedArrayStride(0) {} u64 hash; u8* start_address; @@ -94,16 +94,16 @@ struct ReferencedDataRegion struct CachedDisplayList { CachedDisplayList() - : uncachable(false), + : Regions(NULL), + LastRegion(NULL), + uncachable(false), num_xf_reg(0), num_cp_reg(0), num_bp_reg(0), num_index_xf(0), num_draw_call(0), pass(DLPASS_ANALYZE), - BufferCount(0), - Regions(NULL), - LastRegion(NULL) + BufferCount(0) { frame_count = frameCount; } @@ -188,8 +188,7 @@ struct CachedDisplayList { if(Current->hash) { - // this chek is not strictly necesary now but i left it for an aditional safety check - if(Current->ReferencedArray != -1 && (cached_arraybases[Current->ReferencedArray] != Current->start_address || arraystrides[Current->ReferencedArray] != Current->ReferencedArrayStride)) + if(cached_arraybases[Current->ReferencedArray] != Current->start_address || arraystrides[Current->ReferencedArray] != Current->ReferencedArrayStride) { return false; } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 56aa48cc3b..4ebc164250 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -79,12 +79,14 @@ void VideoBackend::Initialize() void VideoBackend::DoState(PointerWrap&) { +} +void VideoBackend::RunLoop(bool enable) +{ } void VideoBackend::EmuStateChange(EMUSTATE_CHANGE newState) { - } void VideoBackend::Shutdown() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index d14e0fd7cf..2d77d85eb2 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -17,6 +17,7 @@ class VideoBackend : public VideoBackendLLE void EmuStateChange(EMUSTATE_CHANGE newState); void DoState(PointerWrap &p); + void RunLoop(bool enable); void ShowConfig(void* parent);