From: ibs Date: Wed, 5 Dec 2012 07:04:54 +0000 (+0400) Subject: 0023563: Introduce support of MS Visual Studio 2012 X-Git-Tag: V6_7_1~86 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=fdcc027f2d3b77c15ad3916f41b69c0f9992e819;p=occt-wok.git 0023563: Introduce support of MS Visual Studio 2012 vc11 support was added --- diff --git a/src/WOKTclLib/OS.tcl b/src/WOKTclLib/OS.tcl index 3e44cac..a730bf6 100644 --- a/src/WOKTclLib/OS.tcl +++ b/src/WOKTclLib/OS.tcl @@ -3037,6 +3037,8 @@ proc OS:MKCMK { theOutDir {theModules {}} {theAllSolution ""} } { lappend aFileBuff " SET(COMPILER vc9)" lappend aFileBuff "elseif (DEFINED MSVC10)" lappend aFileBuff " SET(COMPILER vc10)" + lappend aFileBuff "elseif (DEFINED MSVC11)" + lappend aFileBuff " SET(COMPILER vc11)" lappend aFileBuff "else()" lappend aFileBuff " SET(COMPILER \$\{CMAKE_GENERATOR\})" lappend aFileBuff "endif()" @@ -3061,9 +3063,6 @@ proc OS:MKCMK { theOutDir {theModules {}} {theAllSolution ""} } { lappend aFileBuff " endforeach()" lappend aFileBuff "endforeach()" lappend aFileBuff "" - #lappend aFileBuff "set(EXECUTABLE_OUTPUT_PATH \$\{CMAKE_INSTALL_PREFIX\}/\$\{SYSTEM\}\$\{BITNESS\}/\$\{COMPILER\}/out)" - #lappend aFileBuff "set(LIBRARY_OUTPUT_PATH \$\{CMAKE_INSTALL_PREFIX\}/\$\{SYSTEM\}\$\{BITNESS\}/\$\{COMPILER\}/out)" - lappend aFileBuff "" foreach aModule $theModules { foreach aToolKit [${aModule}:toolkits] { #create directory @@ -3221,7 +3220,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 {}} {theProjectType {}} {theIDE ""} } { - set aSupportedIDE { "vc7" "vc8" "vc9" "vc10" "cbp" "cmk" "amk" } + set aSupportedIDE { "vc7" "vc8" "vc9" "vc10" "vc11" "cbp" "cmk" "amk" } if { [lsearch $aSupportedIDE $theIDE] < 0 } { puts stderr "WOK does not support generation of project files for the selected IDE: $theIDE\nSupported IDEs: [join ${aSupportedIDE} " "]" @@ -3262,7 +3261,7 @@ proc OS:MKPRC { {theOutDir {}} {theProjectType {}} {theIDE ""} } { # Create output directory set aWokStation "$::env(WOKSTATION)" - if { [lsearch -exact {vc7 vc8 vc9 vc10} $theIDE] != -1 } { + if { [lsearch -exact {vc7 vc8 vc9 vc10 vc11} $theIDE] != -1 } { set aWokStation "msvc" } @@ -3278,7 +3277,8 @@ proc OS:MKPRC { {theOutDir {}} {theProjectType {}} {theIDE ""} } { "vc7" - "vc8" - "vc9" - - "vc10" { OS:MKVC $anOutDir $aModules $anAllSolution $theIDE } + "vc10" - + "vc11" { OS:MKVC $anOutDir $aModules $anAllSolution $theIDE } "cbp" { OS:MKCBP $anOutDir $aModules $anAllSolution } "cmk" { OS:MKCMK $anOutDir $aModules $anAllSolution } "amk" { OS:MKAMK $anOutDir $aModules "adm/${aWokStation}/${theIDE}"} diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl index 2d3177e..e38941c 100755 --- a/src/WOKTclLib/osutils.tcl +++ b/src/WOKTclLib/osutils.tcl @@ -115,6 +115,10 @@ proc osutils:vcsolution:header { vcversion } { append var \ "Microsoft Visual Studio Solution File, Format Version 11.00\n" \ "# Visual Studio 2010\n" + } elseif { "$vcversion" == "vc11" } { + append var \ + "Microsoft Visual Studio Solution File, Format Version 12.00\n" \ + "# Visual Studio 2012\n" } else { puts stderr "Error: Visual Studio version $vcversion is not supported by this function!" } @@ -131,7 +135,7 @@ proc osutils:vcsolution:config:begin { vcversion } { "\t\tRelease = Release\n" \ "\tEndGlobalSection\n" \ "\tGlobalSection(ProjectConfiguration) = postSolution\n" - } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || "$vcversion" == "vc10" } { + } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || "$vcversion" == "vc10" || "$vcversion" == "vc11" } { append var \ "Global\n" \ "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n" \ @@ -155,7 +159,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" } { + } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || "$vcversion" == "vc10" || "$vcversion" == "vc11" } { append var \ "\t\t$guid.Debug|Win32.ActiveCfg = Debug|Win32\n" \ "\t\t$guid.Debug|Win32.Build.0 = Debug|Win32\n" \ @@ -180,7 +184,7 @@ proc osutils:vcsolution:config:end { vcversion } { "\tEndGlobalSection\n" \ "\tGlobalSection(ExtensibilityAddIns) = postSolution\n" \ "\tEndGlobalSection\n" - } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || "$vcversion" == "vc10" } { + } elseif { "$vcversion" == "vc8" || "$vcversion" == "vc9" || "$vcversion" == "vc10" || "$vcversion" == "vc11" } { append var \ "\tEndGlobalSection\n" \ "\tGlobalSection(SolutionProperties) = preSolution\n" \ @@ -745,7 +749,7 @@ proc osutils:vcxproj:file { vcversion file params } { proc osutils:vcproj:ext { vcversion } { if { "$vcversion" == "vc7" || "$vcversion" == "vc8" || "$vcversion" == "vc9" } { return "vcproj" - } elseif { "$vcversion" == "vc10" } { + } elseif { "$vcversion" == "vc10" || "$vcversion" == "vc11" } { return "vcxproj" } else { puts stderr "Error: Visual Studio version $vc is not supported by this function!" @@ -795,6 +799,53 @@ proc osutils:vcxproj:filters { dir proj theFilesMap } { return ${proj}.vcxproj.filters } +# Generate Visual Studio 2011 project filters file +proc osutils:vcx1proj:filters { dir proj theFilesMap } { + upvar $theFilesMap aFilesMap + + # header + append text "\n" + append text "\n" + + # list of "filters" (units) + append text " \n" + append text " \n" + append text " [OS:genGUID]\n" + append text " \n" + foreach unit $aFilesMap(units) { + append text " \n" + append text " [OS:genGUID]\n" + append text " \n" + } + append text " \n" + + # list of files + append text " \n" + foreach unit $aFilesMap(units) { + foreach file $aFilesMap($unit) { + append text " \n" + append text " Source files\\${unit}\n" + append text " \n" + } + } + append text " \n" + + append text " \n" + append text " " + append text " \n" + + # end + append text "" + + # write file + set fp [open [set fvcproj [file join $dir ${proj}.vcxproj.filters]] w] + fconfigure $fp -translation crlf + puts $fp $text + close $fp + + return ${proj}.vcxproj.filters +} + # Generate Visual Studio project file for ToolKit proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} } } { if { $theProjTmpl == {} } {set theProjTmpl [osutils:vcproj:readtemplate $theVcVer 0]} @@ -843,7 +894,7 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} # and put this list to project file puts "$theToolKit requires $aUsedToolKits" - if { "$theVcVer" == "vc10" } { set aUsedToolKits [join $aUsedToolKits {;}] } + if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" } { set aUsedToolKits [join $aUsedToolKits {;}] } regsub -all -- {__TKDEP__} $theProjTmpl $aUsedToolKits theProjTmpl set anIncPaths "..\\..\\..\\inc" @@ -875,8 +926,8 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} #} } - # Format of projects in vc10 is different from vc7-9 - if { "$theVcVer" == "vc10" } { + # Format of projects in vc10 and vc11 is different from vc7-9 + if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" } { foreach aSrcFile [lsort $aSrcFiles] { if { ![info exists written([file tail $aSrcFile])] } { set written([file tail $aSrcFile]) 1 @@ -919,9 +970,11 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} puts $aFile $theProjTmpl close $aFile - # write filters file for vc10 + # write filters file for vc10 and vc11 if { "$theVcVer" == "vc10" } { lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesX] + } elseif { "$theVcVer" == "vc11" } { + lappend aVcFiles [osutils:vcx1proj:filters $theOutDir $theToolKit aVcFilesX] } # write resource file @@ -996,7 +1049,7 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} regsub -all -- {vc[0-9]+} $aUsedToolKits $theVcVer aUsedToolKits puts "$aProjName requires $aUsedToolKits" - if { "$theVcVer" == "vc10" } { set aUsedToolKits [join $aUsedToolKits {;}] } + if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" } { set aUsedToolKits [join $aUsedToolKits {;}] } regsub -all -- {__TKDEP__} $aProjTmpl $aUsedToolKits aProjTmpl set aFilesSection "" @@ -1005,7 +1058,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" } { + if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" } { append aFilesSection [osutils:vcxproj:file $theVcVer $f ""] if { ! [info exists aVcFilesX($theToolKit)] } { lappend aVcFilesX(units) $theToolKit } lappend aVcFilesX($theToolKit) $f @@ -1040,7 +1093,7 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} lappend aVcFiles $aVcFilePath # write filters file for vc10 - if { "$theVcVer" == "vc10" } { + if { "$theVcVer" == "vc10" || "$theVcVer" == "vc11" } { lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesX] } diff --git a/src/WOKTclLib/templates/msvc.bat b/src/WOKTclLib/templates/msvc.bat index 58bc6ab..5036454 100644 --- a/src/WOKTclLib/templates/msvc.bat +++ b/src/WOKTclLib/templates/msvc.bat @@ -16,6 +16,8 @@ if "%VCVER%" == "vc8" ( set "DevEnvDir=%VS90COMNTOOLS%..\IDE" ) else if "%VCVER%" == "vc10" ( set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc11" ( + set "DevEnvDir=%VS110COMNTOOLS%..\IDE" ) else ( echo Error: wrong VS identifier exit /B diff --git a/src/WOKTclLib/templates/template.vc11 b/src/WOKTclLib/templates/template.vc11 new file mode 100644 index 0000000..fdaceaf --- /dev/null +++ b/src/WOKTclLib/templates/template.vc11 @@ -0,0 +1,247 @@ + + + + + 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 + + + + + %(AdditionalOptions) + __TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + 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__/ + Level3 + true + 4996;%(DisableSpecificWarnings) + + + ..\..\..\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) + 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__/ + Level3 + true + ProgramDatabase + Default + 4996;%(DisableSpecificWarnings) + + + ..\..\..\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) + MaxSpeed + OnlyExplicitInline + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + true + Async + MultiThreadedDLL + true + .\..\..\..\win64\vc11\obj\__TKNAM__/ + .\..\..\..\win64\vc11\obj\__TKNAM__/ + .\..\..\..\win64\vc11\obj\__TKNAM__/ + Level3 + true + 4996;%(DisableSpecificWarnings) + + + ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(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) + Disabled + OnlyExplicitInline + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + Async + MultiThreadedDebugDLL + .\..\..\..\win64\vc11\objd\__TKNAM__/ + .\..\..\..\win64\vc11\objd\__TKNAM__/ + .\..\..\..\win64\vc11\objd\__TKNAM__/ + Level3 + true + ProgramDatabase + Default + 4996;%(DisableSpecificWarnings) + + + ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(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/src/WOKTclLib/templates/template.vc11x b/src/WOKTclLib/templates/template.vc11x new file mode 100644 index 0000000..c51e14f --- /dev/null +++ b/src/WOKTclLib/templates/template.vc11x @@ -0,0 +1,239 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + __PROJECT_GUID__ + + + + Application + v110 + + + Application + v110 + + + Application + v110 + + + Application + 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) + 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__/ + Level3 + 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) + 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__/ + Level3 + true + ProgramDatabase + Default + 4996;%(DisableSpecificWarnings) + + + ..\..\..\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) + MaxSpeed + OnlyExplicitInline + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + true + Async + MultiThreadedDLL + true + .\..\..\..\win64\vc11\obj\__XQTNAM__/ + .\..\..\..\win64\vc11\obj\__XQTNAM__/ + .\..\..\..\win64\vc11\obj\__XQTNAM__/ + Level3 + true + 4996;%(DisableSpecificWarnings) + + + ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(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) + Disabled + OnlyExplicitInline + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions) + Async + MultiThreadedDebugDLL + .\..\..\..\win64\vc11\objd\__XQTNAM__/ + .\..\..\..\win64\vc11\objd\__XQTNAM__/ + .\..\..\..\win64\vc11\objd\__XQTNAM__/ + Level3 + true + ProgramDatabase + Default + 4996;%(DisableSpecificWarnings) + + + ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(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/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl index 0deec6d..3245b36 100644 --- a/src/WOKsite/wok_tclshrc.tcl +++ b/src/WOKsite/wok_tclshrc.tcl @@ -135,6 +135,8 @@ if { "$tcl_platform(platform)" == "windows" } { puts " Visual Studio 2008 (vc9), win${env(ARCH)}" } elseif { $env(VCVER) == "vc10" } { puts " Visual Studio 2010 (vc10), win${env(ARCH)}" + } elseif { $env(VCVER) == "vc11" } { + puts " Visual Studio 2012 (vc11), win${env(ARCH)}" } else { puts " Visual Studio ???? ($env(VCVER)), win${env(ARCH)}" } @@ -294,7 +296,8 @@ proc wgenprojbat {thePath theIDE} { "vc7" - "vc8" - "vc9" - - "vc10" { file copy -force -- "$::env(WOKHOME)/lib/templates/msvc.bat" "$aBox/msvc.bat" } + "vc10" - + "vc11" { file copy -force -- "$::env(WOKHOME)/lib/templates/msvc.bat" "$aBox/msvc.bat" } "cbp" { file copy -force -- "$::env(WOKHOME)/lib/templates/codeblocks.sh" "$aBox/codeblocks.sh" } } }