diff options
Diffstat (limited to 'backends')
-rw-r--r-- | backends/platform/sdl/module.mk | 3 | ||||
-rw-r--r-- | backends/platform/sdl/win32/codepage.cpp | 39 | ||||
-rw-r--r-- | backends/platform/sdl/win32/codepage.h | 9 |
3 files changed, 9 insertions, 42 deletions
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk index 5d341773c6..62ef94f19a 100644 --- a/backends/platform/sdl/module.mk +++ b/backends/platform/sdl/module.mk @@ -23,8 +23,7 @@ MODULE_OBJS += \ win32/win32-main.o \ win32/win32-window.o \ win32/win32_wrapper.o \ - win32/win32.o \ - win32/codepage.o + win32/win32.o endif ifdef AMIGAOS diff --git a/backends/platform/sdl/win32/codepage.cpp b/backends/platform/sdl/win32/codepage.cpp deleted file mode 100644 index 2bb3501e5d..0000000000 --- a/backends/platform/sdl/win32/codepage.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * 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; either version 2 - * of the License, or (at your option) any later version. - * - * 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifdef WIN32 -#include "backends/platform/sdl/win32/codepage.h" -namespace Win32 { - -int getCodePageId(Common::String codePageName) { - const CodePageDescription *cp = g_cpDescriptions; - for (; cp->name; cp++) { - if (codePageName.equalsIgnoreCase(cp->name)) - return cp->id; - } - return -1; -} - -} - -#endif - diff --git a/backends/platform/sdl/win32/codepage.h b/backends/platform/sdl/win32/codepage.h index db1f7dd78b..b6454005e6 100644 --- a/backends/platform/sdl/win32/codepage.h +++ b/backends/platform/sdl/win32/codepage.h @@ -192,7 +192,14 @@ const CodePageDescription g_cpDescriptions[] = { {nullptr, 0} //End }; -int getCodePageId(Common::String name); +int getCodePageId(Common::String codePageName) { + const CodePageDescription *cp = g_cpDescriptions; + for (; cp->name; cp++) { + if (codePageName.equalsIgnoreCase(cp->name)) + return cp->id; + } + return -1; +} } #endif // WIN32_CODEPAGE_H |