From 16c857d1b037ae236b01deb798c3fef831ad21eb Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Thu, 5 Dec 2013 23:21:05 -0800 Subject: [PATCH 1/4] - added missing file --- data/glest_game | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/glest_game b/data/glest_game index 25326c465..8b5f421c4 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 25326c465dd0bbd5a9c031cb2daa3e949279d2f1 +Subproject commit 8b5f421c4a2bbb4724cd7f806cebdc97e615f88a From 25dfdb7e08778f113c1059430fcd1f11d80b455d Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Thu, 5 Dec 2013 23:35:24 -0800 Subject: [PATCH 2/4] - added missing file --- data/glest_game | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/glest_game b/data/glest_game index 8b5f421c4..9e0ba584e 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 8b5f421c4a2bbb4724cd7f806cebdc97e615f88a +Subproject commit 9e0ba584e658719c1d2c6c628a9c1c0e421ce7ad From 02d41bd5f746198700eb9d7855dcb035a8bc9279 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Fri, 6 Dec 2013 09:08:47 -0800 Subject: [PATCH 3/4] fixed windows build --- .../sources/platform/win32/gl_wrap_billy.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 From 822f7884f2c50eac631f1ea5a3cf667151e1ea08 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Fri, 6 Dec 2013 12:09:51 -0800 Subject: [PATCH 4/4] update ignore list --- data/glest_game | 2 +- mk/windoze/.gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/glest_game b/data/glest_game index 9e0ba584e..3e3e28d1c 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 9e0ba584e658719c1d2c6c628a9c1c0e421ce7ad +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