diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-13 00:39:55 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-17 02:55:56 +0100 |
| commit | 7e39cf3b0d1bd41f830c8afe792bd0f2d9c8f2a6 (patch) | |
| tree | 37329198335afcd43eff38860be61b42d8b1f6b0 | |
| parent | 2fcaca0603f750bb68349e8bbd506b53dd30915b (diff) | |
.gitignore: fix the build directory pattern
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index ffc4a256aa..750bd009e9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ Thumbs.db # Ignore autogenerated source files Source/Core/Common/scmrev.h # Ignore files output by build -/[Bb]uild[-_]*/ +/[Bb]uild*/ /[Bb]inary/ /obj/ # Ignore various files created by visual studio/msbuild diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 99def4998e..37a18f95f0 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -61,12 +61,12 @@ void VideoBackend::UpdateFPSDisplay(const std::string& text) EmuWindow::SetWindowText(StringFromFormat("%s | D3D | %s", scm_rev_str, text.c_str())); } -std::string VideoBackend::GetName() +std::string VideoBackend::GetName() const { return "D3D"; } -std::string VideoBackend::GetDisplayName() +std::string VideoBackend::GetDisplayName() const { return "Direct3D"; } |