diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-19 17:09:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-19 17:09:40 +0000 |
| commit | 68504d1066c26aa26b73d5be549d7a95d6afd8ed (patch) | |
| tree | aec0dd1ce863c0bf082b7b90e09dfd510bb2714d /tools/mhmake/src/functions.cpp | |
| parent | e99c3e5c94628984d5f1f38b38ce3ed0363e3935 (diff) | |
| download | vcxsrv-68504d1066c26aa26b73d5be549d7a95d6afd8ed.tar.gz vcxsrv-68504d1066c26aa26b73d5be549d7a95d6afd8ed.tar.bz2 vcxsrv-68504d1066c26aa26b73d5be549d7a95d6afd8ed.zip | |
Linux compilation is ok again.
Diffstat (limited to 'tools/mhmake/src/functions.cpp')
| -rw-r--r-- | tools/mhmake/src/functions.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/mhmake/src/functions.cpp b/tools/mhmake/src/functions.cpp index b4ea64783..b1a5f7a46 100644 --- a/tools/mhmake/src/functions.cpp +++ b/tools/mhmake/src/functions.cpp @@ -378,17 +378,18 @@ string mhmakefileparser::f_wildcard(const string & Arg) const _findclose(hFile);
#else
glob_t Res;
- if (glob (FileSpec.c_str(), GLOB_ERR|GLOB_NOSORT|GLOB_MARK, NULL, &Res))
+ if (glob (FileSpec->GetFullFileName().c_str(), GLOB_ERR|GLOB_NOSORT|GLOB_MARK, NULL, &Res))
return g_EmptyString;
string Ret=g_EmptyString;
string SepStr=g_EmptyString;
+ string CheckSpec=FileSpec->GetName();
for (int i=0; i<Res.gl_pathc; i++)
{
- if (PercentMatch(Res.gl_pathv[i],FileSpec,NULL,'*'))
+ if (PercentMatch(Res.gl_pathv[i],CheckSpec,NULL,'*'))
{
Ret+=SepStr;
- Ret+=Res.gl_pathv[i];
+ Ret+=GetFileInfo(Res.gl_pathv[i],Dir)->GetQuotedFullFileName();
SepStr=g_SpaceString;
}
}
|