Merge branch 'master' of github.com:MegaGlest/megaglest-source

This commit is contained in:
Will
2013-12-07 20:41:44 +01:00
3 changed files with 7 additions and 6 deletions

View File

@@ -1,2 +1,3 @@
Release/
/ipch

View File

@@ -30,11 +30,11 @@ 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
//#ifdef WIN32
//DWORD PlatformContextGl::charSet = DEFAULT_CHARSET;
//#else
//int PlatformContextGl::charSet = 1;
//#endif
// ======================================
// Global Fcs