From: kgv Date: Fri, 13 Sep 2013 12:16:52 +0000 (+0400) Subject: 0024175: Generate DRAWEXE.vcxproj.user to launch DRAWEXE for vc10/vc11 projects X-Git-Tag: V6_7_1~36 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=a217a26b73e9055497effdb1a871de7490b5307a;p=occt-wok.git 0024175: Generate DRAWEXE.vcxproj.user to launch DRAWEXE for vc10/vc11 projects --- diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl index adc8bde..337e897 100755 --- a/src/WOKTclLib/osutils.tcl +++ b/src/WOKTclLib/osutils.tcl @@ -1075,6 +1075,7 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} puts $aFile $aProjTmpl close $aFile + set aCommonSettingsFile "$aVcFilePath.user" lappend aVcFiles $aVcFilePath # write filters file for vc10 @@ -1082,9 +1083,15 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesX] } + set aCommonSettingsFileTmpl "" if { "$theVcVer" == "vc9" } { set aCommonSettingsFileTmpl "$::env(WOK_LIBRARY)/templates/vcproj.user.vc9x" - set aCommonSettingsFile "$aVcFilePath.user" + } elseif { "$theVcVer" == "vc10" } { + set aCommonSettingsFileTmpl "$::env(WOK_LIBRARY)/templates/vcxproj.user.vc10x" + } elseif { "$theVcVer" == "vc11" } { + set aCommonSettingsFileTmpl "$::env(WOK_LIBRARY)/templates/vcxproj.user.vc11x" + } + if { "$aCommonSettingsFileTmpl" != "" } { file copy -force -- "$aCommonSettingsFileTmpl" "$aCommonSettingsFile" lappend aVcFiles "$aCommonSettingsFile" } diff --git a/src/WOKTclLib/templates/vcxproj.user.vc10x b/src/WOKTclLib/templates/vcxproj.user.vc10x new file mode 100644 index 0000000..6251b15 --- /dev/null +++ b/src/WOKTclLib/templates/vcxproj.user.vc10x @@ -0,0 +1,19 @@ + + + + PATH=..\..\..\win32\vc10\bind;$(CSF_OPT_BIN32D);$(PATH) + WindowsLocalDebugger + + + PATH=..\..\..\win32\vc10\bin;$(CSF_OPT_BIN32);$(PATH) + WindowsLocalDebugger + + + PATH=..\..\..\win64\vc10\bin;$(CSF_OPT_BIN64);$(PATH) + WindowsLocalDebugger + + + PATH=..\..\..\win64\vc10\bind;$(CSF_OPT_BIN64D);$(PATH) + WindowsLocalDebugger + + \ No newline at end of file diff --git a/src/WOKTclLib/templates/vcxproj.user.vc11x b/src/WOKTclLib/templates/vcxproj.user.vc11x new file mode 100644 index 0000000..3fb8654 --- /dev/null +++ b/src/WOKTclLib/templates/vcxproj.user.vc11x @@ -0,0 +1,19 @@ + + + + PATH=..\..\..\win32\vc11\bind;$(CSF_OPT_BIN32D);$(PATH) + WindowsLocalDebugger + + + PATH=..\..\..\win32\vc11\bin;$(CSF_OPT_BIN32);$(PATH) + WindowsLocalDebugger + + + PATH=..\..\..\win64\vc11\bin;$(CSF_OPT_BIN64);$(PATH) + WindowsLocalDebugger + + + PATH=..\..\..\win64\vc11\bind;$(CSF_OPT_BIN64D);$(PATH) + WindowsLocalDebugger + + \ No newline at end of file