diff --git a/adm/genconf.tcl b/adm/genconf.tcl index 872b1b2300..7293ab62b5 100644 --- a/adm/genconf.tcl +++ b/adm/genconf.tcl @@ -13,10 +13,15 @@ set SYS_VC_LIST {} set SYS_VCVARS_LIST {} # detect installed Visual Studio instances from global environment -if { [info exists ::env(VS130COMNTOOLS)] } { - lappend ::SYS_VS_LIST "Visual Studio 201x (vc13)" - lappend ::SYS_VC_LIST "vc13" - lappend ::SYS_VCVARS_LIST "%VS130COMNTOOLS%..\\..\\VC\\vcvarsall.bat" +if { [info exists ::env(VS150COMNTOOLS)] } { + lappend ::SYS_VS_LIST "Visual Studio 201x (vc15)" + lappend ::SYS_VC_LIST "vc15" + lappend ::SYS_VCVARS_LIST "%VS150COMNTOOLS%..\\..\\VC\\vcvarsall.bat" +} +if { [info exists ::env(VS140COMNTOOLS)] } { + lappend ::SYS_VS_LIST "Visual Studio 2015 (vc14)" + lappend ::SYS_VC_LIST "vc14" + lappend ::SYS_VCVARS_LIST "%VS140COMNTOOLS%..\\..\\VC\\vcvarsall.bat" } if { [info exists ::env(VS120COMNTOOLS)] } { lappend ::SYS_VS_LIST "Visual Studio 2013 (vc12)" diff --git a/adm/genproj.tcl b/adm/genproj.tcl index 1308004e45..7257976cff 100644 --- a/adm/genproj.tcl +++ b/adm/genproj.tcl @@ -1,6 +1,6 @@ # ======================================================================= # This script generates project files for different IDEs: -# "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "cbp" "amk" "xcd" +# "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "cbp" "amk" "xcd" # # Example: # genproj -path=D:/occt -target=vc10 @@ -89,7 +89,7 @@ proc _get_used_files { pk {inc true} {src true} } { # Wrapper-function to generate VS project files proc genproj { args } { global path targetStation - set aSupportedTargets { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "cbp" "amk" "xcd" } + set aSupportedTargets { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "cbp" "amk" "xcd" } set anArgs $args # Setting default IDE. @@ -169,6 +169,7 @@ proc genproj { args } { vc10 - Visual Studio 2010 vc11 - Visual Studio 2012 vc12 - Visual Studio 2013 + vc14 - Visual Studio 2015 cbp - CodeBlocks xcd - XCode amk - AutoMake" @@ -260,7 +261,7 @@ set THE_GUIDS_LIST($aTKNullKey) "{00000000-0000-0000-0000-000000000000}" # Entry function to generate project files and solutions for IDE proc OS:MKPRC { {theOutDir {}} {theIDE ""} {theLibType "dynamic"} {thePlatform ""} } { global path targetStation - set aSupportedIDE { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "cbp" "amk" "xcd" } + set aSupportedIDE { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "cbp" "amk" "xcd" } if { [lsearch $aSupportedIDE $theIDE] < 0 } { puts stderr "WOK does not support generation of project files for the selected IDE: $theIDE\nSupported IDEs: [join ${aSupportedIDE} " "]" @@ -275,7 +276,7 @@ proc OS:MKPRC { {theOutDir {}} {theIDE ""} {theLibType "dynamic"} {thePlatform " # Create output directory set aWokStation "$targetStation" - if { [lsearch -exact {vc7 vc8 vc9 vc10 vc11 vc12} $theIDE] != -1 } { + if { [lsearch -exact {vc7 vc8 vc9 vc10 vc11 vc12 vc14} $theIDE] != -1 } { set aWokStation "msvc" } @@ -329,7 +330,8 @@ proc OS:MKPRC { {theOutDir {}} {theIDE ""} {theLibType "dynamic"} {thePlatform " "vc9" - "vc10" - "vc11" - - "vc12" { OS:MKVC $anOutDir $aModules $anAllSolution $theIDE } + "vc12" - + "vc14" { OS:MKVC $anOutDir $aModules $anAllSolution $theIDE } "cbp" { OS:MKCBP $anOutDir $aModules $anAllSolution } "amk" { OS:MKAMK $anOutDir $aModules "adm/${aWokStation}/${theIDE}"} "xcd" { @@ -757,6 +759,10 @@ proc osutils:vcsolution:header { vcversion } { append var \ "Microsoft Visual Studio Solution File, Format Version 13.00\n" \ "# Visual Studio 2013\n" + } elseif { "$vcversion" == "vc14" } { + append var \ + "Microsoft Visual Studio Solution File, Format Version 12.00\n" \ + "# Visual Studio 14\n" } else { puts stderr "Error: Visual Studio version $vcversion is not supported by this function!" } @@ -767,10 +773,8 @@ proc osutils:vcsolution:header { vcversion } { proc osutils:vcproj:ext { vcversion } { if { "$vcversion" == "vc7" || "$vcversion" == "vc8" || "$vcversion" == "vc9" } { return "vcproj" - } elseif { "$vcversion" == "vc10" || "$vcversion" == "vc11" || "$vcversion" == "vc12" } { - return "vcxproj" } else { - puts stderr "Error: Visual Studio version $vc is not supported by this function!" + return "vcxproj" } } # Generate start of configuration section of VS solution file @@ -784,9 +788,7 @@ proc osutils:vcsolution:config:begin { vcversion } { "\t\tRelease = Release\n" \ "\tEndGlobalSection\n" \ "\tGlobalSection(ProjectConfiguration) = postSolution\n" - } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || - "$vcversion" == "vc10" || "$vcversion" == "vc11" || - "$vcversion" == "vc12" } { + } else { append var \ "Global\n" \ "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n" \ @@ -796,8 +798,6 @@ proc osutils:vcsolution:config:begin { vcversion } { "\t\tRelease|x64 = Release|x64\n" \ "\tEndGlobalSection\n" \ "\tGlobalSection(ProjectConfigurationPlatforms) = postSolution\n" - } else { - puts stderr "Error: Visual Studio version $vcversion is not supported by this function!" } return $var } @@ -810,9 +810,7 @@ proc osutils:vcsolution:config:project { vcversion guid } { "\t\t$guid.Debug.Build.0 = Debug|Win32\n" \ "\t\t$guid.Release.ActiveCfg = Release|Win32\n" \ "\t\t$guid.Release.Build.0 = Release|Win32\n" - } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || - "$vcversion" == "vc10" || "$vcversion" == "vc11" || - "$vcversion" == "vc12" } { + } else { append var \ "\t\t$guid.Debug|Win32.ActiveCfg = Debug|Win32\n" \ "\t\t$guid.Debug|Win32.Build.0 = Debug|Win32\n" \ @@ -822,8 +820,6 @@ proc osutils:vcsolution:config:project { vcversion guid } { "\t\t$guid.Debug|x64.Build.0 = Debug|x64\n" \ "\t\t$guid.Release|x64.ActiveCfg = Release|x64\n" \ "\t\t$guid.Release|x64.Build.0 = Release|x64\n" - } else { - puts stderr "Error: Visual Studio version $vcversion is not supported by this function!" } return $var } @@ -837,16 +833,12 @@ proc osutils:vcsolution:config:end { vcversion } { "\tEndGlobalSection\n" \ "\tGlobalSection(ExtensibilityAddIns) = postSolution\n" \ "\tEndGlobalSection\n" - } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || - "$vcversion" == "vc10" || "$vcversion" == "vc11" || - "$vcversion" == "vc12" } { + } else { append var \ "\tEndGlobalSection\n" \ "\tGlobalSection(SolutionProperties) = preSolution\n" \ "\t\tHideSolutionNode = FALSE\n" \ "\tEndGlobalSection\n" - } else { - puts stderr "Error: Visual Studio version $vcversion is not supported by this function!" } return $var } @@ -993,14 +985,31 @@ proc OS:vcproj { theVcVer theModules theOutDir theGuidsMap } { } # generate template name and load it for given version of Visual Studio and platform -proc osutils:vcproj:readtemplate {vc isexec} { - set ext $vc - set what "$vc" +proc osutils:vcproj:readtemplate {theVcVer isexec} { + set anExt $theVcVer + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { + set anExt vc10 + } + + set what "$theVcVer" + set aVerExt [string range $theVcVer 2 end] + set aVerExt "v${aVerExt}0" + set aCmpl32 "" + set aCmpl64 "" if { $isexec } { - set ext "${ext}x" + set anExt "${anExt}x" set what "$what executable" } - return [osutils:readtemplate $ext "MS VC++ project ($what)"] + if { "$theVcVer" == "vc10" } { + # SSE2 is enabled by default in vc11+, but not in vc10 for 32-bit target + set aCmpl32 "\n StreamingSIMDExtensions2" + } + set aTmpl [osutils:readtemplate $anExt "MS VC++ project ($what)"] + regsub -all -- {__VCVER__} $aTmpl $theVcVer aTmpl + regsub -all -- {__VCVEREXT__} $aTmpl $aVerExt aTmpl + regsub -all -- {__VCMPL32__} $aTmpl $aCmpl32 aTmpl + regsub -all -- {__VCMPL64__} $aTmpl $aCmpl64 aTmpl + return $aTmpl } proc osutils:readtemplate {ext what} { @@ -1437,7 +1446,7 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} # and put this list to project file #puts "$theToolKit requires $aUsedToolKits" - if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" || "$theVcVer" == "vc12" } { + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { set aUsedToolKits [join $aUsedToolKits {;}] } regsub -all -- {__TKDEP__} $theProjTmpl $aUsedToolKits theProjTmpl @@ -1482,8 +1491,8 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} set needparam "$needparam $partopt" } - # Format of projects in vc10 and vc11 is different from vc7-9 - if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" || "$theVcVer" == "vc12" } { + # Format of projects in vc10+ is different from vc7-9 + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { foreach aSrcFile [lsort $aSrcFiles] { if { ![info exists written([file tail $aSrcFile])] } { set written([file tail $aSrcFile]) 1 @@ -1525,10 +1534,12 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} puts $aFile $theProjTmpl close $aFile - # write filters file for vc10 and vc11 - if { "$theVcVer" == "vc10" } { + # write filters file for vc10+ + if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" || "$theVcVer" == "vc9" } { + # nothing + } elseif { "$theVcVer" == "vc10" } { lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesX] - } elseif { "$theVcVer" == "vc11" || "$theVcVer" == "vc12" } { + } else { lappend aVcFiles [osutils:vcx1proj:filters $theOutDir $theToolKit aVcFilesX] } @@ -1653,7 +1664,7 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} regsub -all -- {vc[0-9]+} $aUsedToolKits $theVcVer aUsedToolKits # puts "$aProjName requires $aUsedToolKits" - if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" || "$theVcVer" == "vc12" } { + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { set aUsedToolKits [join $aUsedToolKits {;}] } regsub -all -- {__TKDEP__} $aProjTmpl $aUsedToolKits aProjTmpl @@ -1664,7 +1675,7 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} if { ![info exists written([file tail $f])] } { set written([file tail $f]) 1 - if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" || "$theVcVer" == "vc12" } { + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { append aFilesSection [osutils:vcxproj:file $theVcVer $f ""] if { ! [info exists aVcFilesX($theToolKit)] } { lappend aVcFilesX(units) $theToolKit } lappend aVcFilesX($theToolKit) $f @@ -1697,22 +1708,26 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} lappend aVcFiles $aVcFilePath # write filters file for vc10 - if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" || "$theVcVer" == "vc12" } { + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesX] } set aCommonSettingsFileTmpl "" - if { "$theVcVer" == "vc9" } { - set aCommonSettingsFileTmpl "$path/adm/templates/vcproj.user.vc9x" - } elseif { "$theVcVer" == "vc10" } { - set aCommonSettingsFileTmpl "$path/adm/templates/vcxproj.user.vc10x" - } elseif { "$theVcVer" == "vc11" } { - set aCommonSettingsFileTmpl "$path/adm/templates/vcxproj.user.vc11x" - } elseif { "$theVcVer" == "vc12" } { - set aCommonSettingsFileTmpl "$path/adm/templates/vcxproj.user.vc12x" + if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } { + # nothing + } elseif { "$theVcVer" == "vc9" } { + set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$path/adm/templates/vcproj.user.vc9x"] + } else { + set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$path/adm/templates/vcxproj.user.vc10x"] } if { "$aCommonSettingsFileTmpl" != "" } { - file copy -force -- "$aCommonSettingsFileTmpl" "$aCommonSettingsFile" + regsub -all -- {__VCVER__} $aCommonSettingsFileTmpl $theVcVer aCommonSettingsFileTmpl + + set aFile [open [set aVcFilePath "$aCommonSettingsFile"] w] + fconfigure $aFile -translation crlf + puts $aFile $aCommonSettingsFileTmpl + close $aFile + lappend aVcFiles "$aCommonSettingsFile" } } diff --git a/adm/templates/msvc.bat b/adm/templates/msvc.bat index 6f642f8a83..87eeb25251 100644 --- a/adm/templates/msvc.bat +++ b/adm/templates/msvc.bat @@ -26,6 +26,8 @@ if "%VCVER%" == "vc8" ( ) else if "%VCVER%" == "vc12" ( set "DevEnvDir=%VS120COMNTOOLS%..\IDE" set "VisualStudioExpressName=WDExpress" +) else if "%VCVER%" == "vc14" ( + set "DevEnvDir=%VS140COMNTOOLS%..\IDE" ) else ( echo Error: wrong VS identifier exit /B diff --git a/adm/templates/template.vc10 b/adm/templates/template.vc10 index ee763aea74..a2ed38a74e 100644 --- a/adm/templates/template.vc10 +++ b/adm/templates/template.vc10 @@ -24,15 +24,19 @@ DynamicLibrary + __VCVEREXT__ DynamicLibrary + __VCVEREXT__ DynamicLibrary + __VCVEREXT__ DynamicLibrary + __VCVEREXT__ @@ -52,17 +56,17 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\win32\vc10\bin\ - .\..\..\..\win32\vc10\obj\__TKNAM__\ + .\..\..\..\win32\__VCVER__\bin\ + .\..\..\..\win32\__VCVER__\obj\__TKNAM__\ false - .\..\..\..\win32\vc10\bind\ - .\..\..\..\win32\vc10\objd\__TKNAM__\ + .\..\..\..\win32\__VCVER__\bind\ + .\..\..\..\win32\__VCVER__\objd\__TKNAM__\ false - .\..\..\..\win64\vc10\bin\ - .\..\..\..\win64\vc10\obj\__TKNAM__\ + .\..\..\..\win64\__VCVER__\bin\ + .\..\..\..\win64\__VCVER__\obj\__TKNAM__\ false - .\..\..\..\win64\vc10\bind\ - .\..\..\..\win64\vc10\objd\__TKNAM__\ + .\..\..\..\win64\__VCVER__\bind\ + .\..\..\..\win64\__VCVER__\objd\__TKNAM__\ false @@ -71,7 +75,7 @@ true true Win32 - .\..\..\..\win32\vc10\bin\__TKNAM__.tlb + .\..\..\..\win32\__VCVER__\bin\__TKNAM__.tlb @@ -86,14 +90,13 @@ Async MultiThreadedDLL true - .\..\..\..\win32\vc10\obj\__TKNAM__/ - .\..\..\..\win32\vc10\obj\__TKNAM__/ - .\..\..\..\win32\vc10\obj\__TKNAM__/ + .\..\..\..\win32\__VCVER__\obj\__TKNAM__/ + .\..\..\..\win32\__VCVER__\obj\__TKNAM__/ + .\..\..\..\win32\__VCVER__\obj\__TKNAM__/ Level4 true 4996;%(DisableSpecificWarnings) - StreamingSIMDExtensions2 - Precise + Precise__VCMPL32__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -101,12 +104,12 @@ __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win32\vc10\bin\__TKNAM__.dll + .\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll true - ..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - .\..\..\..\win32\vc10\bin\__TKNAM__.pdb + ..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + .\..\..\..\win32\__VCVER__\bin\__TKNAM__.pdb Console - ..\..\..\win32\vc10\lib\__TKNAM__.lib + ..\..\..\win32\__VCVER__\lib\__TKNAM__.lib @@ -115,7 +118,7 @@ true true Win32 - .\..\..\..\win32\vc10\bind\__TKNAM__.tlb + .\..\..\..\win32\__VCVER__\bind\__TKNAM__.tlb @@ -128,17 +131,16 @@ DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL - .\..\..\..\win32\vc10\objd\__TKNAM__/ - .\..\..\..\win32\vc10\objd\__TKNAM__/ - .\..\..\..\win32\vc10\objd\__TKNAM__/ + .\..\..\..\win32\__VCVER__\objd\__TKNAM__/ + .\..\..\..\win32\__VCVER__\objd\__TKNAM__/ + .\..\..\..\win32\__VCVER__\objd\__TKNAM__/ Level4 true ProgramDatabase Default 4996;%(DisableSpecificWarnings) EnableFastChecks - StreamingSIMDExtensions2 - Precise + Precise__VCMPL32__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -146,13 +148,13 @@ __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win32\vc10\bind\__TKNAM__.dll + .\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll true - ..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) true - ..\..\..\win32\vc10\bind\__TKNAM__.pdb + ..\..\..\win32\__VCVER__\bind\__TKNAM__.pdb Console - ..\..\..\win32\vc10\libd\__TKNAM__.lib + ..\..\..\win32\__VCVER__\libd\__TKNAM__.lib @@ -161,7 +163,7 @@ true true x64 - .\..\..\..\win64\vc10\bin\__TKNAM__.tlb + .\..\..\..\win64\__VCVER__\bin\__TKNAM__.tlb @@ -176,13 +178,13 @@ Async MultiThreadedDLL true - .\..\..\..\win64\vc10\obj\__TKNAM__/ - .\..\..\..\win64\vc10\obj\__TKNAM__/ - .\..\..\..\win64\vc10\obj\__TKNAM__/ + .\..\..\..\win64\__VCVER__\obj\__TKNAM__/ + .\..\..\..\win64\__VCVER__\obj\__TKNAM__/ + .\..\..\..\win64\__VCVER__\obj\__TKNAM__/ Level4 true 4996;%(DisableSpecificWarnings) - Precise + Precise__VCMPL64__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -190,12 +192,12 @@ __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win64\vc10\bin\__TKNAM__.dll + .\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll true - ..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - .\..\..\..\win64\vc10\bin\__TKNAM__.pdb + ..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + .\..\..\..\win64\__VCVER__\bin\__TKNAM__.pdb Console - ..\..\..\win64\vc10\lib\__TKNAM__.lib + ..\..\..\win64\__VCVER__\lib\__TKNAM__.lib @@ -204,7 +206,7 @@ true true x64 - .\..\..\..\win64\vc10\bind\__TKNAM__.tlb + .\..\..\..\win64\__VCVER__\bind\__TKNAM__.tlb @@ -217,16 +219,16 @@ DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL - .\..\..\..\win64\vc10\objd\__TKNAM__/ - .\..\..\..\win64\vc10\objd\__TKNAM__/ - .\..\..\..\win64\vc10\objd\__TKNAM__/ + .\..\..\..\win64\__VCVER__\objd\__TKNAM__/ + .\..\..\..\win64\__VCVER__\objd\__TKNAM__/ + .\..\..\..\win64\__VCVER__\objd\__TKNAM__/ Level4 true ProgramDatabase Default 4996;%(DisableSpecificWarnings) EnableFastChecks - Precise + Precise__VCMPL64__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -234,13 +236,13 @@ __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win64\vc10\bind\__TKNAM__.dll + .\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll true - ..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) true - ..\..\..\win64\vc10\bind\__TKNAM__.pdb + ..\..\..\win64\__VCVER__\bind\__TKNAM__.pdb Console - ..\..\..\win64\vc10\libd\__TKNAM__.lib + ..\..\..\win64\__VCVER__\libd\__TKNAM__.lib diff --git a/adm/templates/template.vc10x b/adm/templates/template.vc10x index f7ed9850b6..7ad650f9bf 100644 --- a/adm/templates/template.vc10x +++ b/adm/templates/template.vc10x @@ -24,15 +24,19 @@ __CONF__ + __VCVEREXT__ __CONF__ + __VCVEREXT__ __CONF__ + __VCVEREXT__ __CONF__ + __VCVEREXT__ @@ -52,17 +56,17 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\win32\vc10\bin\ - .\..\..\..\win32\vc10\obj\__XQTNAM__\ + .\..\..\..\win32\__VCVER__\bin\ + .\..\..\..\win32\__VCVER__\obj\__XQTNAM__\ false - .\..\..\..\win32\vc10\bind\ - .\..\..\..\win32\vc10\objd\__XQTNAM__\ + .\..\..\..\win32\__VCVER__\bind\ + .\..\..\..\win32\__VCVER__\objd\__XQTNAM__\ false - .\..\..\..\win64\vc10\bin\ - .\..\..\..\win64\vc10\obj\__XQTNAM__\ + .\..\..\..\win64\__VCVER__\bin\ + .\..\..\..\win64\__VCVER__\obj\__XQTNAM__\ false - .\..\..\..\win64\vc10\bind\ - .\..\..\..\win64\vc10\objd\__XQTNAM__\ + .\..\..\..\win64\__VCVER__\bind\ + .\..\..\..\win64\__VCVER__\objd\__XQTNAM__\ false @@ -71,7 +75,7 @@ true true Win32 - .\..\..\..\win32\vc10\bin\__XQTNAM__.tlb + .\..\..\..\win32\__VCVER__\bin\__XQTNAM__.tlb @@ -86,14 +90,13 @@ Async MultiThreadedDLL true - .\..\..\..\win32\vc10\obj\__XQTNAM__/ - .\..\..\..\win32\vc10\obj\__XQTNAM__/ - .\..\..\..\win32\vc10\obj\__XQTNAM__/ + .\..\..\..\win32\__VCVER__\obj\__XQTNAM__/ + .\..\..\..\win32\__VCVER__\obj\__XQTNAM__/ + .\..\..\..\win32\__VCVER__\obj\__XQTNAM__/ Level4 true 4996;%(DisableSpecificWarnings) - StreamingSIMDExtensions2 - Precise + Precise__VCMPL32__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -102,10 +105,10 @@ __TKDEP__;%(AdditionalDependencies) true - ..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - .\..\..\..\win32\vc10\bin\__XQTNAM__.pdb + ..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + .\..\..\..\win32\__VCVER__\bin\__XQTNAM__.pdb Console - ..\..\..\win32\vc10\lib\__XQTNAM__.lib + ..\..\..\win32\__VCVER__\lib\__XQTNAM__.lib @@ -114,7 +117,7 @@ true true Win32 - .\..\..\..\win32\vc10\bind\__XQTNAM__.tlb + .\..\..\..\win32\__VCVER__\bind\__XQTNAM__.tlb @@ -127,17 +130,16 @@ DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL - .\..\..\..\win32\vc10\objd\__XQTNAM__/ - .\..\..\..\win32\vc10\objd\__XQTNAM__/ - .\..\..\..\win32\vc10\objd\__XQTNAM__/ + .\..\..\..\win32\__VCVER__\objd\__XQTNAM__/ + .\..\..\..\win32\__VCVER__\objd\__XQTNAM__/ + .\..\..\..\win32\__VCVER__\objd\__XQTNAM__/ Level4 true ProgramDatabase Default 4996;%(DisableSpecificWarnings) - StreamingSIMDExtensions2 EnableFastChecks - Precise + Precise__VCMPL32__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -146,11 +148,11 @@ __TKDEP__;%(AdditionalDependencies) true - ..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) true - ..\..\..\win32\vc10\bind\__XQTNAM__.pdb + ..\..\..\win32\__VCVER__\bind\__XQTNAM__.pdb Console - ..\..\..\win32\vc10\libd\__XQTNAM__.lib + ..\..\..\win32\__VCVER__\libd\__XQTNAM__.lib @@ -159,7 +161,7 @@ true true x64 - .\..\..\..\win64\vc10\bin\__XQTNAM__.tlb + .\..\..\..\win64\__VCVER__\bin\__XQTNAM__.tlb @@ -174,13 +176,13 @@ Async MultiThreadedDLL true - .\..\..\..\win64\vc10\obj\__XQTNAM__/ - .\..\..\..\win64\vc10\obj\__XQTNAM__/ - .\..\..\..\win64\vc10\obj\__XQTNAM__/ + .\..\..\..\win64\__VCVER__\obj\__XQTNAM__/ + .\..\..\..\win64\__VCVER__\obj\__XQTNAM__/ + .\..\..\..\win64\__VCVER__\obj\__XQTNAM__/ Level4 true 4996;%(DisableSpecificWarnings) - Precise + Precise__VCMPL64__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -189,10 +191,10 @@ __TKDEP__;%(AdditionalDependencies) true - ..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - .\..\..\..\win64\vc10\bin\__XQTNAM__.pdb + ..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + .\..\..\..\win64\__VCVER__\bin\__XQTNAM__.pdb Console - ..\..\..\win64\vc10\lib\__XQTNAM__.lib + ..\..\..\win64\__VCVER__\lib\__XQTNAM__.lib @@ -201,7 +203,7 @@ true true x64 - .\..\..\..\win64\vc10\bind\__XQTNAM__.tlb + .\..\..\..\win64\__VCVER__\bind\__XQTNAM__.tlb @@ -214,16 +216,16 @@ DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL - .\..\..\..\win64\vc10\objd\__XQTNAM__/ - .\..\..\..\win64\vc10\objd\__XQTNAM__/ - .\..\..\..\win64\vc10\objd\__XQTNAM__/ + .\..\..\..\win64\__VCVER__\objd\__XQTNAM__/ + .\..\..\..\win64\__VCVER__\objd\__XQTNAM__/ + .\..\..\..\win64\__VCVER__\objd\__XQTNAM__/ Level4 true ProgramDatabase Default 4996;%(DisableSpecificWarnings) EnableFastChecks - Precise + Precise__VCMPL64__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -232,11 +234,11 @@ __TKDEP__;%(AdditionalDependencies) true - ..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) true - ..\..\..\win64\vc10\bind\__XQTNAM__.pdb + ..\..\..\win64\__VCVER__\bind\__XQTNAM__.pdb Console - ..\..\..\win64\vc10\libd\__XQTNAM__.lib + ..\..\..\win64\__VCVER__\libd\__XQTNAM__.lib diff --git a/adm/templates/template.vc11 b/adm/templates/template.vc11 deleted file mode 100644 index 5c09f22d72..0000000000 --- a/adm/templates/template.vc11 +++ /dev/null @@ -1,257 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - __PROJECT_GUID__ - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\win32\vc11\bin\ - .\..\..\..\win32\vc11\obj\__TKNAM__\ - false - .\..\..\..\win32\vc11\bind\ - .\..\..\..\win32\vc11\objd\__TKNAM__\ - false - .\..\..\..\win64\vc11\bin\ - .\..\..\..\win64\vc11\obj\__TKNAM__\ - false - .\..\..\..\win64\vc11\bind\ - .\..\..\..\win64\vc11\objd\__TKNAM__\ - false - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc11\bin\__TKNAM__.tlb - - - - - /bigobj %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win32\vc11\obj\__TKNAM__/ - .\..\..\..\win32\vc11\obj\__TKNAM__/ - .\..\..\..\win32\vc11\obj\__TKNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win32\vc11\bin\__TKNAM__.dll - true - ..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - .\..\..\..\win32\vc11\bin\__TKNAM__.pdb - Console - ..\..\..\win32\vc11\lib\__TKNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc11\bind\__TKNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win32\vc11\objd\__TKNAM__/ - .\..\..\..\win32\vc11\objd\__TKNAM__/ - .\..\..\..\win32\vc11\objd\__TKNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win32\vc11\bind\__TKNAM__.dll - true - ..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) - true - ..\..\..\win32\vc11\bind\__TKNAM__.pdb - Console - ..\..\..\win32\vc11\libd\__TKNAM__.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc11\bin\__TKNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win64\vc11\obj\__TKNAM__/ - .\..\..\..\win64\vc11\obj\__TKNAM__/ - .\..\..\..\win64\vc11\obj\__TKNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win64\vc11\bin\__TKNAM__.dll - true - ..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - .\..\..\..\win64\vc11\bin\__TKNAM__.pdb - Console - ..\..\..\win64\vc11\lib\__TKNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc11\bind\__TKNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win64\vc11\objd\__TKNAM__/ - .\..\..\..\win64\vc11\objd\__TKNAM__/ - .\..\..\..\win64\vc11\objd\__TKNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win64\vc11\bind\__TKNAM__.dll - true - ..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) - true - ..\..\..\win64\vc11\bind\__TKNAM__.pdb - Console - ..\..\..\win64\vc11\libd\__TKNAM__.lib - - - -__FILES__ - - - - - - - - diff --git a/adm/templates/template.vc11x b/adm/templates/template.vc11x deleted file mode 100644 index 17cc49f343..0000000000 --- a/adm/templates/template.vc11x +++ /dev/null @@ -1,245 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - __PROJECT_GUID__ - - - - __CONF__ - v110 - - - __CONF__ - v110 - - - __CONF__ - v110 - - - __CONF__ - v110 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\win32\vc11\bin\ - .\..\..\..\win32\vc11\obj\__XQTNAM__\ - false - .\..\..\..\win32\vc11\bind\ - .\..\..\..\win32\vc11\objd\__XQTNAM__\ - false - .\..\..\..\win64\vc11\bin\ - .\..\..\..\win64\vc11\obj\__XQTNAM__\ - false - .\..\..\..\win64\vc11\bind\ - .\..\..\..\win64\vc11\objd\__XQTNAM__\ - false - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc11\bin\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win32\vc11\obj\__XQTNAM__/ - .\..\..\..\win32\vc11\obj\__XQTNAM__/ - .\..\..\..\win32\vc11\obj\__XQTNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - .\..\..\..\win32\vc11\bin\__XQTNAM__.pdb - Console - ..\..\..\win32\vc11\lib\__XQTNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc11\bind\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win32\vc11\objd\__XQTNAM__/ - .\..\..\..\win32\vc11\objd\__XQTNAM__/ - .\..\..\..\win32\vc11\objd\__XQTNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) - true - ..\..\..\win32\vc11\bind\__XQTNAM__.pdb - Console - ..\..\..\win32\vc11\libd\__XQTNAM__.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc11\bin\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win64\vc11\obj\__XQTNAM__/ - .\..\..\..\win64\vc11\obj\__XQTNAM__/ - .\..\..\..\win64\vc11\obj\__XQTNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - .\..\..\..\win64\vc11\bin\__XQTNAM__.pdb - Console - ..\..\..\win64\vc11\lib\__XQTNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc11\bind\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win64\vc11\objd\__XQTNAM__/ - .\..\..\..\win64\vc11\objd\__XQTNAM__/ - .\..\..\..\win64\vc11\objd\__XQTNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) - true - ..\..\..\win64\vc11\bind\__XQTNAM__.pdb - Console - ..\..\..\win64\vc11\libd\__XQTNAM__.lib - - - -__FILES__ - - - - diff --git a/adm/templates/template.vc12 b/adm/templates/template.vc12 deleted file mode 100644 index 6e180d990a..0000000000 --- a/adm/templates/template.vc12 +++ /dev/null @@ -1,257 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - __PROJECT_GUID__ - - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\win32\vc12\bin\ - .\..\..\..\win32\vc12\obj\__TKNAM__\ - false - .\..\..\..\win32\vc12\bind\ - .\..\..\..\win32\vc12\objd\__TKNAM__\ - false - .\..\..\..\win64\vc12\bin\ - .\..\..\..\win64\vc12\obj\__TKNAM__\ - false - .\..\..\..\win64\vc12\bind\ - .\..\..\..\win64\vc12\objd\__TKNAM__\ - false - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc12\bin\__TKNAM__.tlb - - - - - /bigobj %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win32\vc12\obj\__TKNAM__/ - .\..\..\..\win32\vc12\obj\__TKNAM__/ - .\..\..\..\win32\vc12\obj\__TKNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win32\vc12\bin\__TKNAM__.dll - true - ..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - .\..\..\..\win32\vc12\bin\__TKNAM__.pdb - Console - ..\..\..\win32\vc12\lib\__TKNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc12\bind\__TKNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win32\vc12\objd\__TKNAM__/ - .\..\..\..\win32\vc12\objd\__TKNAM__/ - .\..\..\..\win32\vc12\objd\__TKNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win32\vc12\bind\__TKNAM__.dll - true - ..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) - true - ..\..\..\win32\vc12\bind\__TKNAM__.pdb - Console - ..\..\..\win32\vc12\libd\__TKNAM__.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc12\bin\__TKNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win64\vc12\obj\__TKNAM__/ - .\..\..\..\win64\vc12\obj\__TKNAM__/ - .\..\..\..\win64\vc12\obj\__TKNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win64\vc12\bin\__TKNAM__.dll - true - ..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - .\..\..\..\win64\vc12\bin\__TKNAM__.pdb - Console - ..\..\..\win64\vc12\lib\__TKNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc12\bind\__TKNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win64\vc12\objd\__TKNAM__/ - .\..\..\..\win64\vc12\objd\__TKNAM__/ - .\..\..\..\win64\vc12\objd\__TKNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - Precise - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) - .\..\..\..\win64\vc12\bind\__TKNAM__.dll - true - ..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) - true - ..\..\..\win64\vc12\bind\__TKNAM__.pdb - Console - ..\..\..\win64\vc12\libd\__TKNAM__.lib - - - -__FILES__ - - - - - - - - diff --git a/adm/templates/template.vc12x b/adm/templates/template.vc12x deleted file mode 100644 index 97bfe27b90..0000000000 --- a/adm/templates/template.vc12x +++ /dev/null @@ -1,245 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - __PROJECT_GUID__ - - - - __CONF__ - v120 - - - __CONF__ - v120 - - - __CONF__ - v120 - - - __CONF__ - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\win32\vc12\bin\ - .\..\..\..\win32\vc12\obj\__XQTNAM__\ - false - .\..\..\..\win32\vc12\bind\ - .\..\..\..\win32\vc12\objd\__XQTNAM__\ - false - .\..\..\..\win64\vc12\bin\ - .\..\..\..\win64\vc12\obj\__XQTNAM__\ - false - .\..\..\..\win64\vc12\bind\ - .\..\..\..\win64\vc12\objd\__XQTNAM__\ - false - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc12\bin\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win32\vc12\obj\__XQTNAM__/ - .\..\..\..\win32\vc12\obj\__XQTNAM__/ - .\..\..\..\win32\vc12\obj\__XQTNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - .\..\..\..\win32\vc12\bin\__XQTNAM__.pdb - Console - ..\..\..\win32\vc12\lib\__XQTNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\win32\vc12\bind\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win32\vc12\objd\__XQTNAM__/ - .\..\..\..\win32\vc12\objd\__XQTNAM__/ - .\..\..\..\win32\vc12\objd\__XQTNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) - true - ..\..\..\win32\vc12\bind\__XQTNAM__.pdb - Console - ..\..\..\win32\vc12\libd\__XQTNAM__.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc12\bin\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - MaxSpeed - OnlyExplicitInline - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - true - Async - MultiThreadedDLL - true - .\..\..\..\win64\vc12\obj\__XQTNAM__/ - .\..\..\..\win64\vc12\obj\__XQTNAM__/ - .\..\..\..\win64\vc12\obj\__XQTNAM__/ - Level4 - true - 4996;%(DisableSpecificWarnings) - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - .\..\..\..\win64\vc12\bin\__XQTNAM__.pdb - Console - ..\..\..\win64\vc12\lib\__XQTNAM__.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - x64 - .\..\..\..\win64\vc12\bind\__XQTNAM__.tlb - - - - - %(AdditionalOptions) - __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - true - Disabled - OnlyExplicitInline - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - .\..\..\..\win64\vc12\objd\__XQTNAM__/ - .\..\..\..\win64\vc12\objd\__XQTNAM__/ - .\..\..\..\win64\vc12\objd\__XQTNAM__/ - Level4 - true - ProgramDatabase - Default - 4996;%(DisableSpecificWarnings) - EnableFastChecks - - - ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) - - - __TKDEP__;%(AdditionalDependencies) - true - ..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) - true - ..\..\..\win64\vc12\bind\__XQTNAM__.pdb - Console - ..\..\..\win64\vc12\libd\__XQTNAM__.lib - - - -__FILES__ - - - - diff --git a/adm/templates/vcxproj.user.vc10x b/adm/templates/vcxproj.user.vc10x index 01e2be6514..b4b115bcee 100644 --- a/adm/templates/vcxproj.user.vc10x +++ b/adm/templates/vcxproj.user.vc10x @@ -1,19 +1,19 @@  - PATH=..\..\..\win32\vc10\bind;$(CSF_OPT_BIN32D);$(PATH) + PATH=..\..\..\win32\__VCVER__\bind;$(CSF_OPT_BIN32D);$(PATH) WindowsLocalDebugger - PATH=..\..\..\win32\vc10\bin;$(CSF_OPT_BIN32);$(PATH) + PATH=..\..\..\win32\__VCVER__\bin;$(CSF_OPT_BIN32);$(PATH) WindowsLocalDebugger - PATH=..\..\..\win64\vc10\bin;$(CSF_OPT_BIN64);$(PATH) + PATH=..\..\..\win64\__VCVER__\bin;$(CSF_OPT_BIN64);$(PATH) WindowsLocalDebugger - PATH=..\..\..\win64\vc10\bind;$(CSF_OPT_BIN64D);$(PATH) + PATH=..\..\..\win64\__VCVER__\bind;$(CSF_OPT_BIN64D);$(PATH) WindowsLocalDebugger \ No newline at end of file diff --git a/adm/templates/vcxproj.user.vc11x b/adm/templates/vcxproj.user.vc11x deleted file mode 100644 index c748b84488..0000000000 --- a/adm/templates/vcxproj.user.vc11x +++ /dev/null @@ -1,19 +0,0 @@ - - - - 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 diff --git a/adm/templates/vcxproj.user.vc12x b/adm/templates/vcxproj.user.vc12x deleted file mode 100644 index 3d99caec2c..0000000000 --- a/adm/templates/vcxproj.user.vc12x +++ /dev/null @@ -1,19 +0,0 @@ - - - - PATH=..\..\..\win32\vc12\bind;$(CSF_OPT_BIN32D);$(PATH) - WindowsLocalDebugger - - - PATH=..\..\..\win32\vc12\bin;$(CSF_OPT_BIN32);$(PATH) - WindowsLocalDebugger - - - PATH=..\..\..\win64\vc12\bin;$(CSF_OPT_BIN64);$(PATH) - WindowsLocalDebugger - - - PATH=..\..\..\win64\vc12\bind;$(CSF_OPT_BIN64D);$(PATH) - WindowsLocalDebugger - - \ No newline at end of file