From f9e217df947b81050a579be6b8712fa026bfae80 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Wed, 4 Dec 2013 13:34:00 -0800 Subject: [PATCH] - bugfix so Mac builds --- source/shared_lib/sources/platform/sdl/gl_wrap.cpp | 9 +++++++++ source/shared_lib/sources/platform/unix/gl_wrap.cpp | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp index 3c95041e..6a927b44 100644 --- a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp +++ b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp @@ -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 // ====================================== diff --git a/source/shared_lib/sources/platform/unix/gl_wrap.cpp b/source/shared_lib/sources/platform/unix/gl_wrap.cpp index 8d3e8e59..07f6c74f 100644 --- a/source/shared_lib/sources/platform/unix/gl_wrap.cpp +++ b/source/shared_lib/sources/platform/unix/gl_wrap.cpp @@ -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