diff --git a/mk/windoze/glest_game.vcproj b/mk/windoze/glest_game.vcproj index 6f363b14b..cf99c9158 100755 --- a/mk/windoze/glest_game.vcproj +++ b/mk/windoze/glest_game.vcproj @@ -695,6 +695,14 @@ RelativePath="..\..\source\glest_game\menu\menu_state_masterserver.h" > + + + + diff --git a/mk/windoze/glest_game.vcxproj b/mk/windoze/glest_game.vcxproj index 3912ba1d3..4f97118ab 100644 --- a/mk/windoze/glest_game.vcxproj +++ b/mk/windoze/glest_game.vcxproj @@ -223,6 +223,7 @@ + @@ -311,6 +312,7 @@ + diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp index 0d86a8390..e75303a71 100644 --- a/source/shared_lib/sources/platform/common/platform_common.cpp +++ b/source/shared_lib/sources/platform/common/platform_common.cpp @@ -896,7 +896,13 @@ vector getFolderTreeContentsListRecursively(const string &path, const st int globFlags = 0; if(EndsWith(mypath,"{,.}*") == true) { +#ifndef WIN32 globFlags = GLOB_BRACE; +#else + // Windows glob source cannot handle GLOB_BRACE + // but that should be ok for win32 platform + replaceAll(mypath,"{,.}*","*"); +#endif } int res = glob(mypath.c_str(), globFlags, 0, &globbuf);