diff --git a/data/glest_game b/data/glest_game index 25326c465..3e3e28d1c 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 25326c465dd0bbd5a9c031cb2daa3e949279d2f1 +Subproject commit 3e3e28d1cbb9a500987811f7f46b06a274b167b1 diff --git a/mk/windoze/.gitignore b/mk/windoze/.gitignore index 19cff7dba..1da00c98d 100644 --- a/mk/windoze/.gitignore +++ b/mk/windoze/.gitignore @@ -1,2 +1,3 @@ Release/ +/ipch diff --git a/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp b/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp index 792dc9b02..4e1b0eeb5 100644 --- a/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp +++ b/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp @@ -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