aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Cpp.Build.props6
-rw-r--r--src/dutil/dutil.nuspec2
-rw-r--r--src/dutil/dutil.vcxproj134
-rw-r--r--src/dutil/dutil.vcxproj.filters12
4 files changed, 30 insertions, 124 deletions
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 296b36ca..0e00132b 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -8,6 +8,10 @@
8 <OutDir>$(OutputPath)$(Platform)\</OutDir> 8 <OutDir>$(OutputPath)$(Platform)\</OutDir>
9 </PropertyGroup> 9 </PropertyGroup>
10 10
11 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
12 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
13 </PropertyGroup>
14
11 <ItemDefinitionGroup> 15 <ItemDefinitionGroup>
12 <ClCompile> 16 <ClCompile>
13 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> 17 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
@@ -16,7 +20,7 @@
16 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 20 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17 <PrecompiledHeader>Use</PrecompiledHeader> 21 <PrecompiledHeader>Use</PrecompiledHeader>
18 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> 22 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
19 <CallingConvention>StdCall</CallingConvention> 23 <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
20 <TreatWarningAsError>true</TreatWarningAsError> 24 <TreatWarningAsError>true</TreatWarningAsError>
21 <ExceptionHandling>false</ExceptionHandling> 25 <ExceptionHandling>false</ExceptionHandling>
22 <AdditionalOptions>-YlprecompDefine</AdditionalOptions> 26 <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec
index 7cf7483e..f74081be 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/dutil/dutil.nuspec
@@ -20,5 +20,7 @@
20 <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" /> 20 <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" />
21 <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" /> 21 <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" />
22 <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" /> 22 <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" />
23 <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" />
24 <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
23 </files> 25 </files>
24</package> 26</package>
diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj
index d8393cb4..f44b195c 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/dutil/dutil.vcxproj
@@ -3,10 +3,26 @@
3 3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
6 <ProjectConfiguration Include="Debug|ARM">
7 <Configuration>Debug</Configuration>
8 <Platform>ARM</Platform>
9 </ProjectConfiguration>
10 <ProjectConfiguration Include="Debug|ARM64">
11 <Configuration>Debug</Configuration>
12 <Platform>ARM64</Platform>
13 </ProjectConfiguration>
6 <ProjectConfiguration Include="Debug|Win32"> 14 <ProjectConfiguration Include="Debug|Win32">
7 <Configuration>Debug</Configuration> 15 <Configuration>Debug</Configuration>
8 <Platform>Win32</Platform> 16 <Platform>Win32</Platform>
9 </ProjectConfiguration> 17 </ProjectConfiguration>
18 <ProjectConfiguration Include="Release|ARM">
19 <Configuration>Release</Configuration>
20 <Platform>ARM</Platform>
21 </ProjectConfiguration>
22 <ProjectConfiguration Include="Release|ARM64">
23 <Configuration>Release</Configuration>
24 <Platform>ARM64</Platform>
25 </ProjectConfiguration>
10 <ProjectConfiguration Include="Release|Win32"> 26 <ProjectConfiguration Include="Release|Win32">
11 <Configuration>Release</Configuration> 27 <Configuration>Release</Configuration>
12 <Platform>Win32</Platform> 28 <Platform>Win32</Platform>
@@ -27,135 +43,19 @@
27 <TargetName>dutil</TargetName> 43 <TargetName>dutil</TargetName>
28 <MultiTargetLibrary>true</MultiTargetLibrary> 44 <MultiTargetLibrary>true</MultiTargetLibrary>
29 <PlatformToolset>v141_xp</PlatformToolset> 45 <PlatformToolset>v141_xp</PlatformToolset>
46 <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset>
30 <CharacterSet>MultiByte</CharacterSet> 47 <CharacterSet>MultiByte</CharacterSet>
31 <Description>WiX Toolset native library foundation</Description> 48 <Description>WiX Toolset native library foundation</Description>
32 </PropertyGroup> 49 </PropertyGroup>
33 50
34 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 51 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
35<!--
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
37 <UseDebugLibraries>true</UseDebugLibraries>
38 </PropertyGroup>
39 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
40 <UseDebugLibraries>false</UseDebugLibraries>
41 <WholeProgramOptimization>true</WholeProgramOptimization>
42 </PropertyGroup>
43 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
44 <UseDebugLibraries>true</UseDebugLibraries>
45 </PropertyGroup>
46 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
47 <UseDebugLibraries>false</UseDebugLibraries>
48 <WholeProgramOptimization>true</WholeProgramOptimization>
49 </PropertyGroup>
50 -->
51 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 52 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
52 <ImportGroup Label="ExtensionSettings">
53 </ImportGroup>
54 53
55 <ImportGroup Label="Shared"> 54 <ImportGroup Label="Shared">
56 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" /> 55 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" />
57 </ImportGroup> 56 </ImportGroup>
58 57
59 <Import Project="..\NativeMultiTargeting.Build.props" /> 58 <Import Project="..\NativeMultiTargeting.Build.props" />
60<!--
61 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
62 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63 </ImportGroup>
64 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
65 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66 </ImportGroup>
67 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
68 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69 </ImportGroup>
70 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
71 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
72 </ImportGroup>
73
74 <PropertyGroup Label="UserMacros" />
75
76 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
77 <LinkIncremental>true</LinkIncremental>
78 </PropertyGroup>
79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
80 <LinkIncremental>true</LinkIncremental>
81 </PropertyGroup>
82 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
83 <LinkIncremental>false</LinkIncremental>
84 </PropertyGroup>
85 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86 <LinkIncremental>false</LinkIncremental>
87 </PropertyGroup>
88
89 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90 <ClCompile>
91 <PrecompiledHeader>Use</PrecompiledHeader>
92 <WarningLevel>Level3</WarningLevel>
93 <Optimization>Disabled</Optimization>
94 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95 <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
98 </ClCompile>
99 <Link>
100 <SubSystem>Console</SubSystem>
101 <AdditionalDependencies>advapi32.lib;oleaut32.lib;shell32.lib;ole32.lib;version.lib;activeds.lib;adsiid.lib;crypt32.lib;msi.lib;netapi32.lib;Ws2_32.lib;cabinet.lib;shlwapi.lib;gdiplus.lib;wininet.lib;ESENT.lib;Userenv.lib;Wtsapi32.lib;Comctl32.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
102 </Link>
103 </ItemDefinitionGroup>
104 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
105 <ClCompile>
106 <PrecompiledHeader>Use</PrecompiledHeader>
107 <WarningLevel>Level3</WarningLevel>
108 <Optimization>Disabled</Optimization>
109 <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110 <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
113 </ClCompile>
114 <Link>
115 <SubSystem>Console</SubSystem>
116 <AdditionalDependencies>advapi32.lib;oleaut32.lib;shell32.lib;ole32.lib;version.lib;activeds.lib;adsiid.lib;crypt32.lib;msi.lib;netapi32.lib;Ws2_32.lib;cabinet.lib;shlwapi.lib;gdiplus.lib;wininet.lib;ESENT.lib;Userenv.lib;Wtsapi32.lib;Comctl32.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
117 </Link>
118 </ItemDefinitionGroup>
119 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
120 <ClCompile>
121 <WarningLevel>Level3</WarningLevel>
122 <PrecompiledHeader>Use</PrecompiledHeader>
123 <Optimization>MaxSpeed</Optimization>
124 <FunctionLevelLinking>true</FunctionLevelLinking>
125 <IntrinsicFunctions>true</IntrinsicFunctions>
126 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127 <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
129 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
130 </ClCompile>
131 <Link>
132 <SubSystem>Console</SubSystem>
133 <EnableCOMDATFolding>true</EnableCOMDATFolding>
134 <OptimizeReferences>true</OptimizeReferences>
135 <AdditionalDependencies>advapi32.lib;oleaut32.lib;shell32.lib;ole32.lib;version.lib;activeds.lib;adsiid.lib;crypt32.lib;msi.lib;netapi32.lib;Ws2_32.lib;cabinet.lib;shlwapi.lib;gdiplus.lib;wininet.lib;ESENT.lib;Userenv.lib;Wtsapi32.lib;Comctl32.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
136 <GenerateDebugInformation>true</GenerateDebugInformation>
137 </Link>
138 </ItemDefinitionGroup>
139 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
140 <ClCompile>
141 <WarningLevel>Level3</WarningLevel>
142 <PrecompiledHeader>Use</PrecompiledHeader>
143 <Optimization>MaxSpeed</Optimization>
144 <FunctionLevelLinking>true</FunctionLevelLinking>
145 <IntrinsicFunctions>true</IntrinsicFunctions>
146 <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147 <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
150 </ClCompile>
151 <Link>
152 <SubSystem>Console</SubSystem>
153 <EnableCOMDATFolding>true</EnableCOMDATFolding>
154 <OptimizeReferences>true</OptimizeReferences>
155 <AdditionalDependencies>advapi32.lib;oleaut32.lib;shell32.lib;ole32.lib;version.lib;activeds.lib;adsiid.lib;crypt32.lib;msi.lib;netapi32.lib;Ws2_32.lib;cabinet.lib;shlwapi.lib;gdiplus.lib;wininet.lib;ESENT.lib;Userenv.lib;Wtsapi32.lib;Comctl32.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
156 <GenerateDebugInformation>true</GenerateDebugInformation>
157 </Link>
158 </ItemDefinitionGroup> -->
159 59
160 <ItemGroup> 60 <ItemGroup>
161 <ClCompile Include="acl2util.cpp" /> 61 <ClCompile Include="acl2util.cpp" />
diff --git a/src/dutil/dutil.vcxproj.filters b/src/dutil/dutil.vcxproj.filters
index ddd008ed..acf7591c 100644
--- a/src/dutil/dutil.vcxproj.filters
+++ b/src/dutil/dutil.vcxproj.filters
@@ -132,9 +132,6 @@
132 <ClCompile Include="rssutil.cpp"> 132 <ClCompile Include="rssutil.cpp">
133 <Filter>Source Files</Filter> 133 <Filter>Source Files</Filter>
134 </ClCompile> 134 </ClCompile>
135 <ClCompile Include="sceutil.cpp">
136 <Filter>Source Files</Filter>
137 </ClCompile>
138 <ClCompile Include="shelutil.cpp"> 135 <ClCompile Include="shelutil.cpp">
139 <Filter>Source Files</Filter> 136 <Filter>Source Files</Filter>
140 </ClCompile> 137 </ClCompile>
@@ -186,6 +183,9 @@
186 <ClCompile Include="polcutil.cpp"> 183 <ClCompile Include="polcutil.cpp">
187 <Filter>Source Files</Filter> 184 <Filter>Source Files</Filter>
188 </ClCompile> 185 </ClCompile>
186 <ClCompile Include="deputil.cpp">
187 <Filter>Source Files</Filter>
188 </ClCompile>
189 </ItemGroup> 189 </ItemGroup>
190 <ItemGroup> 190 <ItemGroup>
191 <ClInclude Include="inc\aclutil.h"> 191 <ClInclude Include="inc\aclutil.h">
@@ -311,9 +311,6 @@
311 <ClInclude Include="inc\timeutil.h"> 311 <ClInclude Include="inc\timeutil.h">
312 <Filter>Header Files</Filter> 312 <Filter>Header Files</Filter>
313 </ClInclude> 313 </ClInclude>
314 <ClInclude Include="inc\uncutil.h">
315 <Filter>Header Files</Filter>
316 </ClInclude>
317 <ClInclude Include="inc\uriutil.h"> 314 <ClInclude Include="inc\uriutil.h">
318 <Filter>Header Files</Filter> 315 <Filter>Header Files</Filter>
319 </ClInclude> 316 </ClInclude>
@@ -344,6 +341,9 @@
344 <ClInclude Include="inc\polcutil.h"> 341 <ClInclude Include="inc\polcutil.h">
345 <Filter>Header Files</Filter> 342 <Filter>Header Files</Filter>
346 </ClInclude> 343 </ClInclude>
344 <ClInclude Include="inc\deputil.h">
345 <Filter>Header Files</Filter>
346 </ClInclude>
347 </ItemGroup> 347 </ItemGroup>
348 <ItemGroup> 348 <ItemGroup>
349 <None Include="xsd\thmutil.xsd"> 349 <None Include="xsd\thmutil.xsd">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-02 21:01:56 +0000