mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 21:51:17 +02:00
Code Issues Projects Releases Wiki Activity

merge from upstream

Browse Source
This commit is contained in:
Will
2013-12-04 23:37:04 +01:00
parent e71e7104dc f9e217df94
commit 03c0197437
14 changed files with 553 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -33,6 +33,15 @@ using namespace Shared::PlatformCommon;
namespace Shared{ namespace Platform{
// Example values:
// DEFAULT_CHARSET (English) = 1
// GB2312_CHARSET (Chinese) = 134
#ifdef WIN32
DWORD PlatformContextGl::charSet = DEFAULT_CHARSET;
#else
int PlatformContextGl::charSet = 1;
#endif
// ======================================
// class PlatformContextGl
// ======================================

8
source/shared_lib/sources/platform/unix/gl_wrap.cpp
View File

@@ -28,14 +28,6 @@ using namespace Shared::Util;
namespace Shared { namespace Platform {
// Example values:
// DEFAULT_CHARSET (English) = 1
// GB2312_CHARSET (Chinese) = 134
#ifdef WIN32
DWORD PlatformContextGl::charSet = DEFAULT_CHARSET;
#else
int PlatformContextGl::charSet = 1;
#endif
// ======================================
// Global Fcs