Skip to content

Commit 330c78c

Browse files
bmehta001bmehta001
committed
Merge dependency updates into leak analysis
Integrate PR #1537 into PR #1536 so the dependency and platform updates ship with the leak-analysis work. Resolve the network detector overlap in favor of the leak-safe WinRT lifecycle, narrow the SEH warning suppressions, and consistently enforce the Windows 10 API floor without legacy Windows fallbacks. Files changed: Windows workflows/projects/docs, CMake dependency setup, Android build setup, WinHTTP transport, and WinRT network detection. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: d2b55402-0dec-4ad7-bf0f-d30d92c96171
2 parents af434de + 4d3a49c commit 330c78c

19 files changed

Lines changed: 179 additions & 117 deletions

‎.github/workflows/test-win-latest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ concurrency:
3232

3333
jobs:
3434
test:
35-
name: Test on Windows ${{ matrix.arch }}-${{ matrix.build }}${{ matrix.transport == 'WinInet' && ' (WinInet)' || '' }}
35+
name: Windows 10 API floor ${{ matrix.arch }}-${{ matrix.build }}${{ matrix.transport == 'WinInet' && ' (WinInet)' || '' }}
3636
runs-on: ${{ matrix.os }}
3737
timeout-minutes: 30
3838
strategy:
@@ -75,7 +75,7 @@ jobs:
7575
retention-days: 7
7676

7777
public-headers:
78-
name: Public header gate (MSVC)
78+
name: Public header gate (MSVC, Windows 10 API floor)
7979
runs-on: windows-2022
8080
steps:
8181
- name: Checkout

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ if(MATSDK_SQLITE_PROVIDER_RESOLVED STREQUAL "SYSTEM" AND NOT TARGET SQLite3::SQL
246246
matsdk_add_apple_system_library(SQLite3::SQLite3 sqlite3)
247247
else()
248248
find_package(SQLite3 QUIET)
249-
if(NOT TARGET SQLite3::SQLite3 AND TARGET SQLite::SQLite3)
249+
if(TARGET SQLite::SQLite3 AND NOT TARGET SQLite3::SQLite3)
250250
matsdk_add_interface_dependency(SQLite3::SQLite3 SQLite::SQLite3)
251251
endif()
252252
if(NOT TARGET SQLite3::SQLite3 AND MATSDK_USING_VCPKG)

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@ Other resources to learn how to setup the build system:
100100
* **Supported** - these platforms are known to work well with the SDK in
101101
production.
102102
* **Covered by CI** - these platforms are tested as part of CI.
103-
* Windows 7, Windows 8, and Windows 8.1 are not supported. Some project files
104-
retain older target macros for binary compatibility, but those macros do not
105-
extend the supported operating-system matrix above.
103+
* Windows 7, Windows 8, and Windows 8.1 are not supported. Windows desktop
104+
builds target the Windows 10 API floor in CI.
106105
* For iOS simulator, CI covers representative supported simulator
107106
configurations on the current macOS runner images rather than every
108107
supported iOS 12+ runtime.

‎Solutions/net48/net48.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
</PrecompiledHeader>
114114
<WarningLevel>Level4</WarningLevel>
115115
<Optimization>Disabled</Optimization>
116-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
118118
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
119119
<CompileAsManaged>true</CompileAsManaged>
@@ -196,7 +196,7 @@
196196
<Optimization Condition="'$(Platform)'=='x64'">Disabled</Optimization>
197197
<FunctionLevelLinking>true</FunctionLevelLinking>
198198
<IntrinsicFunctions>false</IntrinsicFunctions>
199-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
199+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200200
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
201201
<CompileAsManaged>true</CompileAsManaged>
202202
<CompileAsWinRT>false</CompileAsWinRT>

‎Solutions/net48/targetver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
66
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
77

8-
#define _WIN32_WINNT 0x0601
8+
#define _WIN32_WINNT 0x0A00
99

1010
#include <SDKDDKVer.h>

‎Solutions/win32-dll/win32-dll.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<PrecompiledHeader>NotUsing</PrecompiledHeader>
163163
<WarningLevel>Level4</WarningLevel>
164164
<Optimization>Disabled</Optimization>
165-
<PreprocessorDefinitions>ORIGINAL_FILENAME="ClientTelemetry.dll";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165+
<PreprocessorDefinitions>ORIGINAL_FILENAME="ClientTelemetry.dll";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166166
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167167
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
168168
<CompileAsManaged>false</CompileAsManaged>
@@ -253,7 +253,7 @@
253253
<Optimization Condition="'$(Platform)'=='ARM64'">MaxSpeed</Optimization>
254254
<FunctionLevelLinking>true</FunctionLevelLinking>
255255
<IntrinsicFunctions>false</IntrinsicFunctions>
256-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
256+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
257257
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258258
<CompileAsManaged>false</CompileAsManaged>
259259
<CompileAsWinRT>false</CompileAsWinRT>

‎Solutions/win32-lib/win32-lib.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
</PrecompiledHeader>
253253
<WarningLevel>Level4</WarningLevel>
254254
<Optimization>Disabled</Optimization>
255-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;WIN32;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
255+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;WIN32;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
256256
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
257257
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
258258
<CompileAsManaged>false</CompileAsManaged>
@@ -320,7 +320,7 @@
320320
</PrecompiledHeader>
321321
<WarningLevel>Level4</WarningLevel>
322322
<Optimization>Disabled</Optimization>
323-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
323+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
324324
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
325325
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
326326
<CompileAsManaged>false</CompileAsManaged>
@@ -395,7 +395,7 @@
395395
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
396396
<FunctionLevelLinking>true</FunctionLevelLinking>
397397
<IntrinsicFunctions>false</IntrinsicFunctions>
398-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
398+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
399399
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
400400
<CompileAsManaged>false</CompileAsManaged>
401401
<CompileAsWinRT>false</CompileAsWinRT>
@@ -471,7 +471,7 @@
471471
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
472472
<FunctionLevelLinking>true</FunctionLevelLinking>
473473
<IntrinsicFunctions>false</IntrinsicFunctions>
474-
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
474+
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
475475
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
476476
<CompileAsManaged>false</CompileAsManaged>
477477
<CompileAsWinRT>false</CompileAsWinRT>

‎Solutions/win32-mini-dll/win32-mini-dll.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<PrecompiledHeader>NotUsing</PrecompiledHeader>
165165
<WarningLevel>Level4</WarningLevel>
166166
<Optimization>MinSpace</Optimization>
167-
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167+
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168168
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
169169
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
170170
<CompileAsManaged>false</CompileAsManaged>
@@ -287,7 +287,7 @@
287287
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
288288
<FunctionLevelLinking>false</FunctionLevelLinking>
289289
<IntrinsicFunctions>false</IntrinsicFunctions>
290-
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
290+
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
291291
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
292292
<CompileAsManaged>false</CompileAsManaged>
293293
<CompileAsWinRT>false</CompileAsWinRT>

‎Solutions/win32-mini-lib/win32-mini-lib.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<PrecompiledHeader>NotUsing</PrecompiledHeader>
256256
<WarningLevel>Level4</WarningLevel>
257257
<Optimization>MinSpace</Optimization>
258-
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
258+
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259259
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
260260
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
261261
<CompileAsManaged>false</CompileAsManaged>
@@ -361,7 +361,7 @@
361361
<PrecompiledHeader>NotUsing</PrecompiledHeader>
362362
<WarningLevel>Level4</WarningLevel>
363363
<Optimization>MinSpace</Optimization>
364-
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
364+
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
365365
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
366366
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
367367
<CompileAsManaged>false</CompileAsManaged>
@@ -474,7 +474,7 @@
474474
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
475475
<FunctionLevelLinking>false</FunctionLevelLinking>
476476
<IntrinsicFunctions>false</IntrinsicFunctions>
477-
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
477+
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
478478
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
479479
<CompileAsManaged>false</CompileAsManaged>
480480
<CompileAsWinRT>false</CompileAsWinRT>
@@ -579,7 +579,7 @@
579579
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
580580
<FunctionLevelLinking>false</FunctionLevelLinking>
581581
<IntrinsicFunctions>true</IntrinsicFunctions>
582-
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
582+
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN10;_WIN32_WINNT=_WIN32_WINNT_WIN10;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
583583
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
584584
<CompileAsManaged>false</CompileAsManaged>
585585
<CompileAsWinRT>false</CompileAsWinRT>

‎build-android.cmd‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
@echo off
2-
pushd "%~dp0"
3-
4-
REM Users may override the default %ANDROID_SDK_ROOT% location if necessary
5-
6-
if "%ANDROID_SDK_ROOT%" == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
7-
if "%ANDROID_NDK_VERSION%" == "" set "ANDROID_NDK_VERSION=27.0.12077973"
8-
if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.22.1"
9-
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
10-
if "%ANDROID_NDK%" == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
11-
if "%ANDROID_NDK_HOME%" == "" set "ANDROID_NDK_HOME=%ANDROID_NDK%"
12-
REM Consider using %ANDROID_NDK_ROOT% environment variable
13-
14-
REM Install Android tools if necessary
15-
call tools\setup-buildtools-android.cmd
16-
17-
set "PATH=%ANDROID_SDK_ROOT%\cmake\%ANDROID_CMAKE_VERSION%\bin;%ANDROID_NDK%;%PATH%"
18-
19-
echo Building SDK
20-
pushd .\lib\android_build
21-
call .\gradlew.bat maesdk:assemble app:assemble %*
22-
popd
23-
24-
echo Building Tests
25-
pushd .\lib\android_build
26-
call .\gradlew.bat maesdk:test %*
27-
popd
28-
29-
popd
1+
@echo off
2+
pushd "%~dp0"
3+
4+
REM Users may override the default %ANDROID_SDK_ROOT% location if necessary
5+
6+
if "%ANDROID_SDK_ROOT%" == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
7+
if "%ANDROID_NDK_VERSION%" == "" set "ANDROID_NDK_VERSION=27.0.12077973"
8+
if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.22.1"
9+
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
10+
if "%ANDROID_NDK%" == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
11+
if "%ANDROID_NDK_HOME%" == "" set "ANDROID_NDK_HOME=%ANDROID_NDK%"
12+
REM Consider using %ANDROID_NDK_ROOT% environment variable
13+
14+
REM Install Android tools if necessary
15+
call tools\setup-buildtools-android.cmd
16+
if errorlevel 1 exit /b %ERRORLEVEL%
17+
18+
set "PATH=%ANDROID_SDK_ROOT%\cmake\%ANDROID_CMAKE_VERSION%\bin;%ANDROID_NDK%;%PATH%"
19+
20+
echo Building SDK
21+
pushd .\lib\android_build
22+
call .\gradlew.bat maesdk:assemble app:assemble %*
23+
popd
24+
25+
echo Building Tests
26+
pushd .\lib\android_build
27+
call .\gradlew.bat maesdk:test %*
28+
popd
29+
30+
popd

0 commit comments

Comments
 (0)