diff --git a/SConstruct b/SConstruct index a35f08324d..999add6e5f 100644 --- a/SConstruct +++ b/SConstruct @@ -210,11 +210,11 @@ elif (flavour == 'prof'): elif (flavour == 'release'): compileFlags.append('-O3') compileFlags.append('-fomit-frame-pointer'); - warnings.append('error') # more warnings if env['lint']: - warnings.append('unreachable-code') - warnings.append('float-equal') + warnings.append('error') + #warnings.append('unreachable-code') + #warnings.append('float-equal') # add the warnings to the compile flags compileFlags += [ ('-W' + warning) for warning in warnings ] diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index d10537c069..a9bd6ed579 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -620,10 +620,6 @@ RelativePath=".\Src\CDUtils.h" > - - diff --git a/Source/Core/Common/Src/ChunkFile.cpp b/Source/Core/Common/Src/ChunkFile.cpp index dc9b9b66a5..e69de29bb2 100644 --- a/Source/Core/Common/Src/ChunkFile.cpp +++ b/Source/Core/Common/Src/ChunkFile.cpp @@ -1,22 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" -#include "ChunkFile.h" - -#include - diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 8c3aba54c0..4a39d19ee7 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -7,12 +7,10 @@ files = [ "ABI.cpp", "BreakPoints.cpp", "CDUtils.cpp", - "ChunkFile.cpp", "ColorUtil.cpp", "ConsoleListener.cpp", "CPUDetect.cpp", "DynamicLibrary.cpp", - "ExtendedTrace.cpp", "FileSearch.cpp", "FileUtil.cpp", "Hash.cpp", @@ -46,6 +44,7 @@ files = [ ] if sys.platform == 'win32': + files += [ "ExtendedTrace.cpp" ] files += [ "stdafx.cpp" ] env_common = env.Clone() diff --git a/Source/Core/Core/Src/CoreRerecording.cpp b/Source/Core/Core/Src/CoreRerecording.cpp index e382351df5..f544a5515d 100644 --- a/Source/Core/Core/Src/CoreRerecording.cpp +++ b/Source/Core/Core/Src/CoreRerecording.cpp @@ -17,9 +17,9 @@ #include "Setup.h" -#ifdef RERECORDING - - +#ifndef RERECORDING +bool rerecording = false; +#else // Include // -------------- diff --git a/Source/Core/DSPCore/DSPCore.vcproj b/Source/Core/DSPCore/DSPCore.vcproj index b21a5760eb..a532fb8094 100644 --- a/Source/Core/DSPCore/DSPCore.vcproj +++ b/Source/Core/DSPCore/DSPCore.vcproj @@ -502,10 +502,6 @@ RelativePath=".\Src\DSPAnalyzer.h" > - - diff --git a/Source/Core/DSPCore/Src/DSPBreakpoints.cpp b/Source/Core/DSPCore/Src/DSPBreakpoints.cpp index 0ab7de9abf..e69de29bb2 100644 --- a/Source/Core/DSPCore/Src/DSPBreakpoints.cpp +++ b/Source/Core/DSPCore/Src/DSPBreakpoints.cpp @@ -1,19 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "DSPBreakpoints.h" - diff --git a/Source/Core/DSPCore/Src/SConscript b/Source/Core/DSPCore/Src/SConscript index 1c091cb5c7..c63f995e19 100644 --- a/Source/Core/DSPCore/Src/SConscript +++ b/Source/Core/DSPCore/Src/SConscript @@ -6,7 +6,6 @@ files = [ "assemble.cpp", "disassemble.cpp", "DSPAccelerator.cpp", - "DSPBreakpoints.cpp", "DSPIntCCUtil.cpp", "DSPIntExtOps.cpp", "DSPHWInterface.cpp", diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 8bafc8aa15..e87e996b65 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -423,7 +423,7 @@ void CFrame::InitBitmaps() m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(toolbar_help_png); // Scale the 48x48 bitmaps to 24x24 - for (size_t n = Toolbar_FileOpen; n <= Toolbar_Help; n++) + for (size_t n = Toolbar_FileOpen; n < EToolbar_Max; n++) { m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24)); } diff --git a/Source/Dolphin.xcodeproj/project.pbxproj b/Source/Dolphin.xcodeproj/project.pbxproj index 7f75c81114..e04c133408 100644 --- a/Source/Dolphin.xcodeproj/project.pbxproj +++ b/Source/Dolphin.xcodeproj/project.pbxproj @@ -39,7 +39,6 @@ 292AC1FC11838FD700B8790B /* BreakPoints.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABD9B11838FD400B8790B /* BreakPoints.h */; }; 292AC1FD11838FD700B8790B /* CDUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABD9C11838FD400B8790B /* CDUtils.cpp */; }; 292AC1FE11838FD700B8790B /* CDUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABD9D11838FD400B8790B /* CDUtils.h */; }; - 292AC1FF11838FD700B8790B /* ChunkFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABD9E11838FD400B8790B /* ChunkFile.cpp */; }; 292AC20011838FD700B8790B /* ChunkFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABD9F11838FD400B8790B /* ChunkFile.h */; }; 292AC20111838FD700B8790B /* ColorUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABDA011838FD400B8790B /* ColorUtil.cpp */; }; 292AC20211838FD700B8790B /* ColorUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABDA111838FD400B8790B /* ColorUtil.h */; }; @@ -62,7 +61,6 @@ 292AC21311838FD700B8790B /* DebugInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABDB311838FD400B8790B /* DebugInterface.h */; }; 292AC21411838FD700B8790B /* DynamicLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABDB411838FD400B8790B /* DynamicLibrary.cpp */; }; 292AC21511838FD700B8790B /* DynamicLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABDB511838FD400B8790B /* DynamicLibrary.h */; }; - 292AC21611838FD700B8790B /* ExtendedTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABDB611838FD400B8790B /* ExtendedTrace.cpp */; }; 292AC21711838FD700B8790B /* ExtendedTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABDB711838FD400B8790B /* ExtendedTrace.h */; }; 292AC21811838FD700B8790B /* FileSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABDB811838FD400B8790B /* FileSearch.cpp */; }; 292AC21911838FD700B8790B /* FileSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABDB911838FD400B8790B /* FileSearch.h */; }; @@ -501,7 +499,6 @@ 292AC3D211838FD700B8790B /* DSPAccelerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABFCA11838FD600B8790B /* DSPAccelerator.h */; }; 292AC3D311838FD700B8790B /* DSPAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABFCB11838FD600B8790B /* DSPAnalyzer.cpp */; }; 292AC3D411838FD700B8790B /* DSPAnalyzer.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABFCC11838FD600B8790B /* DSPAnalyzer.h */; }; - 292AC3D511838FD700B8790B /* DSPBreakpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABFCD11838FD600B8790B /* DSPBreakpoints.cpp */; }; 292AC3D611838FD700B8790B /* DSPBreakpoints.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABFCE11838FD600B8790B /* DSPBreakpoints.h */; }; 292AC3D711838FD700B8790B /* DSPCodeUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292ABFCF11838FD600B8790B /* DSPCodeUtil.cpp */; }; 292AC3D811838FD700B8790B /* DSPCodeUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 292ABFD011838FD600B8790B /* DSPCodeUtil.h */; }; @@ -1300,7 +1297,6 @@ 292ABD9B11838FD400B8790B /* BreakPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BreakPoints.h; sourceTree = ""; }; 292ABD9C11838FD400B8790B /* CDUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDUtils.cpp; sourceTree = ""; }; 292ABD9D11838FD400B8790B /* CDUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDUtils.h; sourceTree = ""; }; - 292ABD9E11838FD400B8790B /* ChunkFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChunkFile.cpp; sourceTree = ""; }; 292ABD9F11838FD400B8790B /* ChunkFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChunkFile.h; sourceTree = ""; }; 292ABDA011838FD400B8790B /* ColorUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorUtil.cpp; sourceTree = ""; }; 292ABDA111838FD400B8790B /* ColorUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorUtil.h; sourceTree = ""; }; @@ -1323,7 +1319,6 @@ 292ABDB311838FD400B8790B /* DebugInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugInterface.h; sourceTree = ""; }; 292ABDB411838FD400B8790B /* DynamicLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicLibrary.cpp; sourceTree = ""; }; 292ABDB511838FD400B8790B /* DynamicLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLibrary.h; sourceTree = ""; }; - 292ABDB611838FD400B8790B /* ExtendedTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendedTrace.cpp; sourceTree = ""; }; 292ABDB711838FD400B8790B /* ExtendedTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedTrace.h; sourceTree = ""; }; 292ABDB811838FD400B8790B /* FileSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSearch.cpp; sourceTree = ""; }; 292ABDB911838FD400B8790B /* FileSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSearch.h; sourceTree = ""; }; @@ -1822,7 +1817,6 @@ 292ABFCA11838FD600B8790B /* DSPAccelerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPAccelerator.h; sourceTree = ""; }; 292ABFCB11838FD600B8790B /* DSPAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPAnalyzer.cpp; sourceTree = ""; }; 292ABFCC11838FD600B8790B /* DSPAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPAnalyzer.h; sourceTree = ""; }; - 292ABFCD11838FD600B8790B /* DSPBreakpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPBreakpoints.cpp; sourceTree = ""; }; 292ABFCE11838FD600B8790B /* DSPBreakpoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPBreakpoints.h; sourceTree = ""; }; 292ABFCF11838FD600B8790B /* DSPCodeUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPCodeUtil.cpp; sourceTree = ""; }; 292ABFD011838FD600B8790B /* DSPCodeUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPCodeUtil.h; sourceTree = ""; }; @@ -2700,7 +2694,6 @@ 292ABD9B11838FD400B8790B /* BreakPoints.h */, 292ABD9C11838FD400B8790B /* CDUtils.cpp */, 292ABD9D11838FD400B8790B /* CDUtils.h */, - 292ABD9E11838FD400B8790B /* ChunkFile.cpp */, 292ABD9F11838FD400B8790B /* ChunkFile.h */, 292ABDA011838FD400B8790B /* ColorUtil.cpp */, 292ABDA111838FD400B8790B /* ColorUtil.h */, @@ -2717,7 +2710,6 @@ 292ABDB311838FD400B8790B /* DebugInterface.h */, 292ABDB411838FD400B8790B /* DynamicLibrary.cpp */, 292ABDB511838FD400B8790B /* DynamicLibrary.h */, - 292ABDB611838FD400B8790B /* ExtendedTrace.cpp */, 292ABDB711838FD400B8790B /* ExtendedTrace.h */, 292ABDB811838FD400B8790B /* FileSearch.cpp */, 292ABDB911838FD400B8790B /* FileSearch.h */, @@ -3450,7 +3442,6 @@ 292ABFCA11838FD600B8790B /* DSPAccelerator.h */, 292ABFCB11838FD600B8790B /* DSPAnalyzer.cpp */, 292ABFCC11838FD600B8790B /* DSPAnalyzer.h */, - 292ABFCD11838FD600B8790B /* DSPBreakpoints.cpp */, 292ABFCE11838FD600B8790B /* DSPBreakpoints.h */, 292ABFCF11838FD600B8790B /* DSPCodeUtil.cpp */, 292ABFD011838FD600B8790B /* DSPCodeUtil.h */, @@ -5407,7 +5398,6 @@ 292AC1F611838FD700B8790B /* ABI.cpp in Sources */, 292AC1FB11838FD700B8790B /* BreakPoints.cpp in Sources */, 292AC1FD11838FD700B8790B /* CDUtils.cpp in Sources */, - 292AC1FF11838FD700B8790B /* ChunkFile.cpp in Sources */, 292AC20111838FD700B8790B /* ColorUtil.cpp in Sources */, 292AC20811838FD700B8790B /* ConsoleListener.cpp in Sources */, 292AC20A11838FD700B8790B /* CPUDetect.cpp in Sources */, @@ -5416,7 +5406,6 @@ 292AC20E11838FD700B8790B /* md5.cpp in Sources */, 292AC21011838FD700B8790B /* sha1.cpp in Sources */, 292AC21411838FD700B8790B /* DynamicLibrary.cpp in Sources */, - 292AC21611838FD700B8790B /* ExtendedTrace.cpp in Sources */, 292AC21811838FD700B8790B /* FileSearch.cpp in Sources */, 292AC21A11838FD700B8790B /* FileUtil.cpp in Sources */, 292AC21D11838FD700B8790B /* Hash.cpp in Sources */, @@ -5651,7 +5640,6 @@ 292AC3CF11838FD700B8790B /* disassemble.cpp in Sources */, 292AC3D111838FD700B8790B /* DSPAccelerator.cpp in Sources */, 292AC3D311838FD700B8790B /* DSPAnalyzer.cpp in Sources */, - 292AC3D511838FD700B8790B /* DSPBreakpoints.cpp in Sources */, 292AC3D711838FD700B8790B /* DSPCodeUtil.cpp in Sources */, 292AC3DA11838FD700B8790B /* DSPCore.cpp in Sources */, 292AC3DC11838FD700B8790B /* DSPEmitter.cpp in Sources */,