Skip to content

Commit a87b544

Browse files
RatinCNRatinCN
committed
[SYNC] Update KNSoft.NDK and MSVC-Template
1 parent 57629fc commit a87b544

7 files changed

Lines changed: 34 additions & 47 deletions

File tree

‎Source/Demo/Demo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <KNSoft/NDK/NDK.h>
44
#include <KNSoft/NDK/Package/UnitTest.h>
5-
#include <KNSoft/NDK/Package/StrSafe.h>
5+
#include <KNSoft/NDK/Package/StrSafe.inl>
66

77
#include "../SlimDetours/SlimDetours.h"
88
#include "../Detours/src/detours.h"

‎Source/Demo/Demo.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@
199199
<ImportGroup Label="ExtensionTargets">
200200
<Import Project="$(VCTargetsPath)\BuildCustomizations\marmasm.targets" />
201201
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
202-
<Import Project="..\packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets')" />
202+
<Import Project="..\packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets')" />
203203
</ImportGroup>
204204
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
205205
<PropertyGroup>
206206
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
207207
</PropertyGroup>
208-
<Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets'))" />
208+
<Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets'))" />
209209
</Target>
210210
</Project>

‎Source/Demo/Main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ HRESULT GetEngineTypeFromArgs(
4444

4545
for (i = 0; i < ArgC; i++)
4646
{
47-
if (_wcsnicmp(ArgV[i], DEMO_SWITCH_ENGINE, _STR_CCH_LEN(DEMO_SWITCH_ENGINE)) == 0)
47+
if (_wcsnicmp(ArgV[i], DEMO_SWITCH_ENGINE, _STR_LEN(DEMO_SWITCH_ENGINE)) == 0)
4848
{
49-
pszEngineType = ArgV[i] + _STR_CCH_LEN(DEMO_SWITCH_ENGINE);
49+
pszEngineType = ArgV[i] + _STR_LEN(DEMO_SWITCH_ENGINE);
5050
if (_wcsicmp(pszEngineType, L"SlimDetours") == 0)
5151
{
5252
*EngineType = EngineSlimDetours;

‎Source/Demo/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="KNSoft.NDK" version="1.2.28-beta" targetFramework="native" />
3+
<package id="KNSoft.NDK" version="1.2.34-beta" targetFramework="native" />
44
</packages>

‎Source/Directory.Build.props‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,36 @@
1010
<LanguageStandard>stdcpplatest</LanguageStandard>
1111
<LanguageStandard_C>stdclatest</LanguageStandard_C>
1212
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
13-
<ObjectFileName>$(IntDir)%(Directory)</ObjectFileName>
13+
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
1414
</ClCompile>
1515
<MASM>
16-
<ObjectFileName>$(IntDir)%(Directory)</ObjectFileName>
16+
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
1717
</MASM>
1818
</ItemDefinitionGroup>
1919

20+
<!-- Use static default libraries -->
21+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
22+
<ClCompile>
23+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
24+
</ClCompile>
25+
</ItemDefinitionGroup>
26+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
27+
<ClCompile>
28+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
29+
</ClCompile>
30+
</ItemDefinitionGroup>
31+
32+
<!-- Disable LTCG and ignore default libraries for LIB -->
33+
<ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
34+
<Lib>
35+
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
36+
<LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
37+
</Lib>
38+
<ClCompile>
39+
<OmitDefaultLibName>true</OmitDefaultLibName>
40+
</ClCompile>
41+
</ItemDefinitionGroup>
42+
2043
<!-- MSBuild variable to C/C++ macro -->
2144
<ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'Application'">
2245
<ClCompile>
@@ -52,18 +75,6 @@
5275
</ClCompile>
5376
</ItemDefinitionGroup>
5477

55-
<!-- Use static default libraries -->
56-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
57-
<ClCompile>
58-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
59-
</ClCompile>
60-
</ItemDefinitionGroup>
61-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
62-
<ClCompile>
63-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
64-
</ClCompile>
65-
</ItemDefinitionGroup>
66-
6778
<!-- Bring CL Macros to MASM and MARMASM -->
6879
<ItemDefinitionGroup>
6980
<MASM>

‎Source/KNSoft.SlimDetours.vcxproj‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,92 +85,68 @@
8585
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8686
<ClCompile>
8787
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88-
<OmitDefaultLibName>true</OmitDefaultLibName>
8988
</ClCompile>
9089
<Link>
9190
<SubSystem>Console</SubSystem>
9291
<GenerateDebugInformation>true</GenerateDebugInformation>
9392
</Link>
94-
<Lib>
95-
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
96-
</Lib>
9793
</ItemDefinitionGroup>
9894
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9995
<ClCompile>
10096
<FunctionLevelLinking>true</FunctionLevelLinking>
10197
<IntrinsicFunctions>true</IntrinsicFunctions>
10298
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103-
<OmitDefaultLibName>true</OmitDefaultLibName>
10499
</ClCompile>
105100
<Link>
106101
<SubSystem>Console</SubSystem>
107102
<EnableCOMDATFolding>true</EnableCOMDATFolding>
108103
<OptimizeReferences>true</OptimizeReferences>
109104
<GenerateDebugInformation>true</GenerateDebugInformation>
110105
</Link>
111-
<Lib>
112-
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
113-
</Lib>
114106
</ItemDefinitionGroup>
115107
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
116108
<ClCompile>
117109
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118-
<OmitDefaultLibName>true</OmitDefaultLibName>
119110
</ClCompile>
120111
<Link>
121112
<SubSystem>Console</SubSystem>
122113
<GenerateDebugInformation>true</GenerateDebugInformation>
123114
</Link>
124-
<Lib>
125-
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
126-
</Lib>
127115
</ItemDefinitionGroup>
128116
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
129117
<ClCompile>
130118
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131-
<OmitDefaultLibName>true</OmitDefaultLibName>
132119
</ClCompile>
133120
<Link>
134121
<SubSystem>Console</SubSystem>
135122
<GenerateDebugInformation>true</GenerateDebugInformation>
136123
</Link>
137-
<Lib>
138-
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
139-
</Lib>
140124
</ItemDefinitionGroup>
141125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
142126
<ClCompile>
143127
<FunctionLevelLinking>true</FunctionLevelLinking>
144128
<IntrinsicFunctions>true</IntrinsicFunctions>
145129
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146-
<OmitDefaultLibName>true</OmitDefaultLibName>
147130
</ClCompile>
148131
<Link>
149132
<SubSystem>Console</SubSystem>
150133
<EnableCOMDATFolding>true</EnableCOMDATFolding>
151134
<OptimizeReferences>true</OptimizeReferences>
152135
<GenerateDebugInformation>true</GenerateDebugInformation>
153136
</Link>
154-
<Lib>
155-
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
156-
</Lib>
157137
</ItemDefinitionGroup>
158138
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
159139
<ClCompile>
160140
<FunctionLevelLinking>true</FunctionLevelLinking>
161141
<IntrinsicFunctions>true</IntrinsicFunctions>
162142
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163-
<OmitDefaultLibName>true</OmitDefaultLibName>
164143
</ClCompile>
165144
<Link>
166145
<SubSystem>Console</SubSystem>
167146
<EnableCOMDATFolding>true</EnableCOMDATFolding>
168147
<OptimizeReferences>true</OptimizeReferences>
169148
<GenerateDebugInformation>true</GenerateDebugInformation>
170149
</Link>
171-
<Lib>
172-
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
173-
</Lib>
174150
</ItemDefinitionGroup>
175151
<ItemGroup>
176152
<ClCompile Include="Detours\src\creatwth.cpp" />
@@ -211,12 +187,12 @@
211187
</ItemGroup>
212188
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
213189
<ImportGroup Label="ExtensionTargets">
214-
<Import Project="packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets" Condition="Exists('packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets')" />
190+
<Import Project="packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets" Condition="Exists('packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets')" />
215191
</ImportGroup>
216192
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
217193
<PropertyGroup>
218194
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
219195
</PropertyGroup>
220-
<Error Condition="!Exists('packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\KNSoft.NDK.1.2.28-beta\build\KNSoft.NDK.targets'))" />
196+
<Error Condition="!Exists('packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\KNSoft.NDK.1.2.34-beta\build\KNSoft.NDK.targets'))" />
221197
</Target>
222198
</Project>

‎Source/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="KNSoft.NDK" version="1.2.28-beta" targetFramework="native" />
3+
<package id="KNSoft.NDK" version="1.2.34-beta" targetFramework="native" />
44
</packages>

0 commit comments

Comments
 (0)