diff options
| author | OpportunityLiu <[email protected]> | 2019-08-26 17:00:08 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-08-26 17:00:08 +0800 |
| commit | 116c0f260725e26ae5de6207698e94cfaee7c5d5 (patch) | |
| tree | ae7addca876c18cb16d9d72838426c3a54b93bfb /xmake/plugins/project | |
| parent | 9dab7e4739cb4e1d9b51117fbf1932a4b83635cc (diff) | |
fix XMAKE_CONFIGDIR
Diffstat (limited to 'xmake/plugins/project')
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.props | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.targets | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props index ddec0f57d..873644f52 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props @@ -34,7 +34,7 @@ <XmakeConfigFileDir Condition="'$(XmakeConfigFileDir)' == ''">$(XmakeBuilDir)\$(XmakePlat)\$(XmakeArch)\$(XmakeMode)</XmakeConfigFileDir> <XmakeConfigDir Condition="'$(XmakeConfigDir)' == ''">$(XMAKE_CONFIGDIR)</XmakeConfigDir> - <XmakeConfigDir Condition="'$(XmakeConfigDir)' == ''">$(XmakeProjectDir)\.xmake</XmakeConfigDir> + <XmakeConfigDir Condition="'$(XmakeConfigDir)' == ''">$(XmakeProjectDir)</XmakeConfigDir> <XmakeRunDir Condition="'$(XmakeRunDir)' == ''">$(XmakeTargetDir)</XmakeRunDir> </PropertyGroup> diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets index 62639139d..2c3a89293 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets @@ -70,6 +70,13 @@ set XMAKE_CONFIGDIR=$(XmakeConfigDirResolved.TrimEnd('/\'.ToCharArray())) set XMAKE_PROGRAM_DIR=$(XmakeProgramDirResolved.TrimEnd('/\'.ToCharArray())) </_XmakeEnv> + <_XmakeEnv Condition="$(XmakeDiagnosis)"> + $(_XmakeEnv) + echo XMAKE_CONFIGDIR=%25XMAKE_CONFIGDIR%25 + echo XMAKE_PROGRAM_DIR=%25XMAKE_PROGRAM_DIR%25 + echo CD=%25CD%25 + chcp + </_XmakeEnv> </PropertyGroup> <Target Name="_XmakeProjCheck"> |