mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
0027115: Configuration, genproj - add headers to generated MS VS projects
Header files and non-compilable source files are now included within generated VS projects. genproj now generates DRAWEXE.rc.
This commit is contained in:
kgv
bugmaster
parent
6ff61620a3
commit
cf4bee7c0c
193
adm/genproj.tcl
193
adm/genproj.tcl
@ -1263,12 +1263,16 @@ proc wokUtils:FILES:FileToString { fin } {
|
||||
|
||||
# List extensions of compilable files in OCCT
|
||||
proc osutils:compilable {thePlatform} {
|
||||
if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
|
||||
return [list .c .cxx .cpp .mm]
|
||||
}
|
||||
if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .c .cxx .cpp .mm] }
|
||||
return [list .c .cxx .cpp]
|
||||
}
|
||||
|
||||
# List extensions of header file in OCCT
|
||||
proc osutils:fileExtensionsHeaders {thePlatform} {
|
||||
if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .h .hxx .hpp .lxx .pxx .gxx ] }
|
||||
return [list .h .hxx .hpp .lxx .pxx .gxx .mm ]
|
||||
}
|
||||
|
||||
proc osutils:commonUsedTK { theToolKit } {
|
||||
set anUsedToolKits [list]
|
||||
set aDepToolkits [LibToLink $theToolKit]
|
||||
@ -1465,8 +1469,7 @@ proc osutils:tk:units { tkloc } {
|
||||
}
|
||||
|
||||
proc osutils:justwnt { listloc } {
|
||||
# ImageUtility is required for support for old (<6.5.4) versions of OCCT
|
||||
set goaway [list Xdps Xw ImageUtility WOKUnix]
|
||||
set goaway [list Xw]
|
||||
return [osutils:juststation $goaway $listloc]
|
||||
}
|
||||
|
||||
@ -1556,31 +1559,28 @@ proc wokUtils:FILES:wtail { f n } {
|
||||
}
|
||||
|
||||
# Generate entry for one source file in Visual Studio 10 project file
|
||||
proc osutils:vcxproj:file { file params } {
|
||||
append text " <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
|
||||
if { $params != "" } {
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|Win32\'\">[string trim ${params}] %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
}
|
||||
|
||||
if { $params != "" } {
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|Win32\'\">[string trim ${params}] %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
}
|
||||
|
||||
if { $params != "" } {
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|x64\'\">[string trim ${params}] %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
}
|
||||
|
||||
if { $params != "" } {
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|x64\'\">[string trim ${params}] %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
proc osutils:vcxproj:cxxfile { theFile theParams } {
|
||||
if { $theParams == "" } {
|
||||
return " <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\" />\n"
|
||||
}
|
||||
|
||||
set aParams [string trim ${theParams}]
|
||||
append text " <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\">\n"
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|Win32\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|Win32\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|x64\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
append text " <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|x64\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
|
||||
append text " </ClCompile>\n"
|
||||
return $text
|
||||
}
|
||||
|
||||
# Generate entry for one header file in Visual Studio 10 project file
|
||||
proc osutils:vcxproj:hxxfile { theFile } { return " <ClInclude Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\" />\n" }
|
||||
|
||||
# Generate Visual Studio 2010 project filters file
|
||||
proc osutils:vcxproj:filters { dir proj theFilesMap } {
|
||||
upvar $theFilesMap aFilesMap
|
||||
proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
|
||||
upvar $theCxxFilesMap aCxxFilesMap
|
||||
upvar $theHxxFilesMap aHxxFilesMap
|
||||
|
||||
# header
|
||||
append text "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||
@ -1591,60 +1591,25 @@ proc osutils:vcxproj:filters { dir proj theFilesMap } {
|
||||
append text " <Filter Include=\"Source files\">\n"
|
||||
append text " <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
|
||||
append text " </Filter>\n"
|
||||
foreach unit $aFilesMap(units) {
|
||||
append text " <Filter Include=\"Source files\\${unit}\">\n"
|
||||
append text " <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
|
||||
append text " </Filter>\n"
|
||||
}
|
||||
append text " </ItemGroup>\n"
|
||||
|
||||
# list of files
|
||||
append text " <ItemGroup>\n"
|
||||
foreach unit $aFilesMap(units) {
|
||||
foreach file $aFilesMap($unit) {
|
||||
append text " <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
|
||||
append text " <Filter>Source files\\${unit}</Filter>\n"
|
||||
append text " </ClCompile>\n"
|
||||
}
|
||||
}
|
||||
append text " </ItemGroup>\n"
|
||||
|
||||
# end
|
||||
append text "</Project>"
|
||||
|
||||
# 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 2011 project filters file
|
||||
proc osutils:vcx1proj:filters { dir proj theFilesMap } {
|
||||
upvar $theFilesMap aFilesMap
|
||||
|
||||
# header
|
||||
append text "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||
append text "<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
|
||||
|
||||
# list of "filters" (units)
|
||||
append text " <ItemGroup>\n"
|
||||
append text " <Filter Include=\"Source files\">\n"
|
||||
append text " <Filter Include=\"Header files\">\n"
|
||||
append text " <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
|
||||
append text " </Filter>\n"
|
||||
foreach unit $aFilesMap(units) {
|
||||
foreach unit $aCxxFilesMap(units) {
|
||||
append text " <Filter Include=\"Source files\\${unit}\">\n"
|
||||
append text " <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
|
||||
append text " </Filter>\n"
|
||||
}
|
||||
foreach unit $aHxxFilesMap(units) {
|
||||
append text " <Filter Include=\"Header files\\${unit}\">\n"
|
||||
append text " <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
|
||||
append text " </Filter>\n"
|
||||
}
|
||||
append text " </ItemGroup>\n"
|
||||
|
||||
# list of files
|
||||
# list of cxx files
|
||||
append text " <ItemGroup>\n"
|
||||
foreach unit $aFilesMap(units) {
|
||||
foreach file $aFilesMap($unit) {
|
||||
foreach unit $aCxxFilesMap(units) {
|
||||
foreach file $aCxxFilesMap($unit) {
|
||||
append text " <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
|
||||
append text " <Filter>Source files\\${unit}</Filter>\n"
|
||||
append text " </ClCompile>\n"
|
||||
@ -1652,8 +1617,19 @@ proc osutils:vcx1proj:filters { dir proj theFilesMap } {
|
||||
}
|
||||
append text " </ItemGroup>\n"
|
||||
|
||||
# list of hxx files
|
||||
append text " <ItemGroup>\n"
|
||||
append text " <ResourceCompile Include=\"${proj}.rc\" />"
|
||||
foreach unit $aHxxFilesMap(units) {
|
||||
foreach file $aHxxFilesMap($unit) {
|
||||
append text " <ClInclude Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
|
||||
append text " <Filter>Header files\\${unit}</Filter>\n"
|
||||
append text " </ClInclude>\n"
|
||||
}
|
||||
}
|
||||
append text " </ItemGroup>\n"
|
||||
|
||||
append text " <ItemGroup>\n"
|
||||
append text " <ResourceCompile Include=\"${proj}.rc\" />\n"
|
||||
append text " </ItemGroup>\n"
|
||||
|
||||
# end
|
||||
@ -1726,9 +1702,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
set anIncPaths "..\\..\\..\\inc"
|
||||
# set aTKDefines ""
|
||||
set aFilesSection ""
|
||||
set aVcFilesX(units) ""
|
||||
set aVcFilesCxx(units) ""
|
||||
set aVcFilesHxx(units) ""
|
||||
set listloc [osutils:tk:units $theToolKit]
|
||||
set resultloc [osutils:justwnt $listloc]
|
||||
if [array exists written] { unset written }
|
||||
#puts "\t1 [wokparam -v %CMPLRS_CXX_Options [w_info -f]] father"
|
||||
#puts "\t2 [wokparam -v %CMPLRS_CXX_Options] branch"
|
||||
@ -1737,9 +1713,10 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
set fxloparamfcxx [lindex [osutils:intersect3 [_get_options wnt cmplrs_cxx f] [_get_options wnt cmplrs_cxx b]] 2]
|
||||
set fxloparamfc [lindex [osutils:intersect3 [_get_options wnt cmplrs_c f] [_get_options wnt cmplrs_c b]] 2]
|
||||
set fxloparam ""
|
||||
foreach fxlo $resultloc {
|
||||
foreach fxlo $listloc {
|
||||
set xlo $fxlo
|
||||
set aSrcFiles [osutils:tk:files $xlo wnt]
|
||||
set aSrcFiles [osutils:tk:cxxfiles $xlo wnt]
|
||||
set aHxxFiles [osutils:tk:hxxfiles $xlo wnt]
|
||||
set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx $fxlo]
|
||||
if {$fxlo_cmplrs_options_cxx == ""} {
|
||||
set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx b]
|
||||
@ -1768,12 +1745,22 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
foreach aSrcFile [lsort $aSrcFiles] {
|
||||
if { ![info exists written([file tail $aSrcFile])] } {
|
||||
set written([file tail $aSrcFile]) 1
|
||||
append aFilesSection [osutils:vcxproj:file $aSrcFile $needparam]
|
||||
append aFilesSection [osutils:vcxproj:cxxfile $aSrcFile $needparam]
|
||||
} else {
|
||||
puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]"
|
||||
}
|
||||
if { ! [info exists aVcFilesX($xlo)] } { lappend aVcFilesX(units) $xlo }
|
||||
lappend aVcFilesX($xlo) $aSrcFile
|
||||
if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo }
|
||||
lappend aVcFilesCxx($xlo) $aSrcFile
|
||||
}
|
||||
foreach aHxxFile [lsort $aHxxFiles] {
|
||||
if { ![info exists written([file tail $aHxxFile])] } {
|
||||
set written([file tail $aHxxFile]) 1
|
||||
append aFilesSection [osutils:vcxproj:hxxfile $aHxxFile]
|
||||
} else {
|
||||
puts "Warning : in vcproj more than one occurences for [file tail $aHxxFile]"
|
||||
}
|
||||
if { ! [info exists aVcFilesHxx($xlo)] } { lappend aVcFilesHxx(units) $xlo }
|
||||
lappend aVcFilesHxx($xlo) $aHxxFile
|
||||
}
|
||||
} else {
|
||||
append aFilesSection "\t\t\t<Filter\n"
|
||||
@ -1789,15 +1776,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
}
|
||||
append aFilesSection "\t\t\t</Filter>\n"
|
||||
}
|
||||
|
||||
# macros
|
||||
# append aTKDefines ";__${xlo}_DLL"
|
||||
# common includes
|
||||
# append anIncPaths ";..\\..\\..\\src\\${xlo}"
|
||||
}
|
||||
|
||||
regsub -all -- {__TKINC__} $theProjTmpl $anIncPaths theProjTmpl
|
||||
# regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
|
||||
regsub -all -- {__FILES__} $theProjTmpl $aFilesSection theProjTmpl
|
||||
|
||||
# write file
|
||||
@ -1807,12 +1788,8 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
close $aFile
|
||||
|
||||
# write filters file for vc10+
|
||||
if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" || "$theVcVer" == "vc9" } {
|
||||
# nothing
|
||||
} elseif { "$theVcVer" == "vc10" } {
|
||||
lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesX]
|
||||
} else {
|
||||
lappend aVcFiles [osutils:vcx1proj:filters $theOutDir $theToolKit aVcFilesX]
|
||||
if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
|
||||
lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesCxx aVcFilesHxx]
|
||||
}
|
||||
|
||||
# write resource file
|
||||
@ -1844,16 +1821,14 @@ proc osutils:tk:loadunit { loc map } {
|
||||
return
|
||||
}
|
||||
|
||||
# Returns the list of all compilable files name in a toolkit, or devunit of any type
|
||||
# Tfiles lists for each unit the type of file that can be compiled.
|
||||
proc osutils:tk:files { tkloc thePlatform } {
|
||||
# Returns the list of all files name in a toolkit within specified list of file extensions.
|
||||
proc osutils:tk:files { tkloc theExtensions } {
|
||||
set Tfiles(source,nocdlpack) {source pubinclude}
|
||||
set Tfiles(source,toolkit) {}
|
||||
set Tfiles(source,executable) {source pubinclude}
|
||||
set listloc [concat [osutils:tk:units $tkloc] $tkloc]
|
||||
#puts " listloc = $listloc"
|
||||
|
||||
set l_comp [osutils:compilable $thePlatform]
|
||||
set resultloc $listloc
|
||||
set lret {}
|
||||
foreach loc $resultloc {
|
||||
@ -1878,7 +1853,7 @@ proc osutils:tk:files { tkloc thePlatform } {
|
||||
#puts $type
|
||||
foreach f $map($type) {
|
||||
#puts $f
|
||||
if { [lsearch $l_comp [file extension $f]] != -1 } {
|
||||
if { [lsearch $theExtensions [file extension $f]] != -1 } {
|
||||
lappend lret $f
|
||||
}
|
||||
}
|
||||
@ -1887,10 +1862,16 @@ proc osutils:tk:files { tkloc thePlatform } {
|
||||
return $lret
|
||||
}
|
||||
|
||||
# Returns the list of all compilable files name in a toolkit.
|
||||
proc osutils:tk:cxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:compilable $thePlatform]] }
|
||||
|
||||
# Returns the list of all header files name in a toolkit.
|
||||
proc osutils:tk:hxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:fileExtensionsHeaders $thePlatform]] }
|
||||
|
||||
# Generate Visual Studio project file for executable
|
||||
proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
set aVcFiles {}
|
||||
foreach f [osutils:tk:files $theToolKit wnt] {
|
||||
foreach f [osutils:tk:cxxfiles $theToolKit wnt] {
|
||||
set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]
|
||||
|
||||
set aProjName [file rootname [file tail $f]]
|
||||
@ -1925,15 +1906,16 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
regsub -all -- {__TKDEP__} $aProjTmpl $aUsedLibs aProjTmpl
|
||||
|
||||
set aFilesSection ""
|
||||
set aVcFilesX(units) ""
|
||||
set aVcFilesCxx(units) ""
|
||||
set aVcFilesHxx(units) ""
|
||||
|
||||
if { ![info exists written([file tail $f])] } {
|
||||
set written([file tail $f]) 1
|
||||
|
||||
if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
|
||||
append aFilesSection [osutils:vcxproj:file $f ""]
|
||||
if { ! [info exists aVcFilesX($theToolKit)] } { lappend aVcFilesX(units) $theToolKit }
|
||||
lappend aVcFilesX($theToolKit) $f
|
||||
append aFilesSection [osutils:vcxproj:cxxfile $f ""]
|
||||
if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit }
|
||||
lappend aVcFilesCxx($theToolKit) $f
|
||||
} else {
|
||||
append aFilesSection "\t\t\t<Filter\n"
|
||||
append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
|
||||
@ -1945,10 +1927,8 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
puts "Warning : in vcproj there are than one occurences for [file tail $f]"
|
||||
}
|
||||
#puts "$aProjTmpl $aFilesSection"
|
||||
# set aTKDefines ";__${theToolKit}_DLL"
|
||||
set anIncPaths "..\\..\\..\\inc"
|
||||
regsub -all -- {__TKINC__} $aProjTmpl $anIncPaths aProjTmpl
|
||||
# regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines aProjTmpl
|
||||
regsub -all -- {__FILES__} $aProjTmpl $aFilesSection aProjTmpl
|
||||
regsub -all -- {__CONF__} $aProjTmpl Application aProjTmpl
|
||||
|
||||
@ -1964,9 +1944,12 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
|
||||
|
||||
# write filters file for vc10
|
||||
if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
|
||||
lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesX]
|
||||
lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
|
||||
}
|
||||
|
||||
# write resource file
|
||||
lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
|
||||
|
||||
set aCommonSettingsFileTmpl ""
|
||||
if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
|
||||
# nothing
|
||||
@ -2149,7 +2132,7 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} {
|
||||
if [array exists written] { unset written }
|
||||
foreach fxlo $resultloc {
|
||||
set xlo $fxlo
|
||||
set aSrcFiles [osutils:tk:files $xlo $thePlatform]
|
||||
set aSrcFiles [osutils:tk:cxxfiles $xlo $thePlatform]
|
||||
foreach aSrcFile [lsort $aSrcFiles] {
|
||||
if { ![info exists written([file tail $aSrcFile])] } {
|
||||
set written([file tail $aSrcFile]) 1
|
||||
@ -2243,7 +2226,7 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } {
|
||||
set aWokArch "$::env(ARCH)"
|
||||
|
||||
set aCbpFiles {}
|
||||
foreach aSrcFile [osutils:tk:files $theToolKit $thePlatform] {
|
||||
foreach aSrcFile [osutils:tk:cxxfiles $theToolKit $thePlatform] {
|
||||
# collect list of referred libraries to link with
|
||||
set aUsedLibs [list]
|
||||
set aFrameworks [list]
|
||||
@ -2682,7 +2665,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
|
||||
set aDepToolkits [lappend [wokUtils:LIST:Purge [osutils:tk:close $theToolKit]] $theToolKit]
|
||||
|
||||
if { "$theTargetType" == "executable" } {
|
||||
set aFile [osutils:tk:files $theToolKit mac]
|
||||
set aFile [osutils:tk:cxxfiles $theToolKit mac]
|
||||
set aProjName [file rootname [file tail $aFile]]
|
||||
set aDepToolkits [LibToLinkX $theToolKit $aProjName]
|
||||
}
|
||||
@ -2748,7 +2731,7 @@ proc osutils:xcdtk:sources {theToolKit theTargetType theSrcFileRefSection theGro
|
||||
set aGuidsMap($aPackage) [OS:genGUID "xcd"]
|
||||
}
|
||||
|
||||
set aSrcFiles [osutils:tk:files $xlo mac]
|
||||
set aSrcFiles [osutils:tk:cxxfiles $xlo mac]
|
||||
foreach aSrcFile [lsort $aSrcFiles] {
|
||||
set aFileExt "sourcecode.cpp.cpp"
|
||||
|
||||
|
||||
@ -248,7 +248,11 @@
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
__FILES__ </ItemGroup>
|
||||
__FILES__
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="__XQTNAM__.rc" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
|
||||
@ -14,6 +14,5 @@ Font_NListOfSystemFont.hxx
|
||||
Font_Rect.hxx
|
||||
Font_SystemFont.cxx
|
||||
Font_SystemFont.hxx
|
||||
Font_NameOfFont.hxx
|
||||
Font_TextFormatter.hxx
|
||||
Font_TextFormatter.cxx
|
||||
@ -12,7 +12,9 @@
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#include <windows.h>
|
||||
#if defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <WNT_WClass.hxx>
|
||||
|
||||
|
||||
@ -12,8 +12,10 @@
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
// include windows.h first to have all definitions available
|
||||
#include <windows.h>
|
||||
#if defined(_WIN32)
|
||||
// include windows.h first to have all definitions available
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <WNT_Window.hxx>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user