Skip to content

Commit 0f1bb2a

Browse files
klukaszekklukaszek
committed
Misc: Merge working branch and rebase with upstream.
2 parents 30bbcee + 40b7aad commit 0f1bb2a

File tree

152 files changed

+10236
-1847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+10236
-1847
lines changed

‎CMakeLists.txt‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,20 @@ if(NOT DEFINED CMAKE_BUILD_TYPE)
55
endif()
66

77
# See docs/release_checklist.md
8-
project(SDL3 LANGUAGES C VERSION "3.2.1")
8+
project(SDL3 LANGUAGES C VERSION "3.2.5")
99

1010
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
1111
set(SDL3_MAINPROJECT ON)
1212
else()
1313
set(SDL3_MAINPROJECT OFF)
1414
endif()
1515

16+
# Add UTF-8 encoding support for MSVC compiler.
17+
# This ensures that the MSVC compiler interprets source files as UTF-8 encoded,
18+
# which is useful for projects containing non-ASCII characters in source files.
19+
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
20+
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
21+
1622
# By default, configure SDL3 in RelWithDebInfo configuration
1723
if(SDL3_MAINPROJECT)
1824
get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -238,6 +244,8 @@ if(SDL_SHARED_DEFAULT AND SDL_STATIC_DEFAULT AND SDL_SHARED_AVAILABLE)
238244
endif()
239245
endif()
240246

247+
dep_option(SDL_DEPS_SHARED "Load dependencies dynamically" ON SDL_SHARED_AVAILABLE OFF)
248+
241249
set(SDL_SUBSYSTEMS )
242250

243251
macro(define_sdl_subsystem _name)
@@ -329,19 +337,19 @@ set_option(SDL_PTHREADS "Use POSIX threads for multi-threading" ${SDL
329337
dep_option(SDL_PTHREADS_SEM "Use pthread semaphores" ON "SDL_PTHREADS" OFF)
330338
dep_option(SDL_OSS "Support the OSS audio API" ${SDL_OSS_DEFAULT} "UNIX_SYS OR RISCOS;SDL_AUDIO" OFF)
331339
dep_option(SDL_ALSA "Support the ALSA audio API" ${UNIX_SYS} "SDL_AUDIO" OFF)
332-
dep_option(SDL_ALSA_SHARED "Dynamically load ALSA audio support" ON "SDL_ALSA" OFF)
340+
dep_option(SDL_ALSA_SHARED "Dynamically load ALSA audio support" ON "SDL_ALSA;SDL_DEPS_SHARED" OFF)
333341
dep_option(SDL_JACK "Support the JACK audio API" ${UNIX_SYS} "SDL_AUDIO" OFF)
334-
dep_option(SDL_JACK_SHARED "Dynamically load JACK audio support" ON "SDL_JACK" OFF)
342+
dep_option(SDL_JACK_SHARED "Dynamically load JACK audio support" ON "SDL_JACK;SDL_DEPS_SHARED" OFF)
335343
set_option(SDL_PIPEWIRE "Use Pipewire audio" ${UNIX_SYS})
336-
dep_option(SDL_PIPEWIRE_SHARED "Dynamically load Pipewire support" ON "SDL_PIPEWIRE" OFF)
344+
dep_option(SDL_PIPEWIRE_SHARED "Dynamically load Pipewire support" ON "SDL_PIPEWIRE;SDL_DEPS_SHARED" OFF)
337345
dep_option(SDL_PULSEAUDIO "Use PulseAudio" ${UNIX_SYS} "SDL_AUDIO" OFF)
338-
dep_option(SDL_PULSEAUDIO_SHARED "Dynamically load PulseAudio support" ON "SDL_PULSEAUDIO" OFF)
346+
dep_option(SDL_PULSEAUDIO_SHARED "Dynamically load PulseAudio support" ON "SDL_PULSEAUDIO;SDL_DEPS_SHARED" OFF)
339347
dep_option(SDL_SNDIO "Support the sndio audio API" ${UNIX_SYS} "SDL_AUDIO" OFF)
340-
dep_option(SDL_SNDIO_SHARED "Dynamically load the sndio audio API" ON "SDL_SNDIO" OFF)
348+
dep_option(SDL_SNDIO_SHARED "Dynamically load the sndio audio API" ON "SDL_SNDIO;SDL_DEPS_SHARED" OFF)
341349
set_option(SDL_RPATH "Use an rpath when linking SDL" ${SDL_RPATH_DEFAULT})
342350
set_option(SDL_CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" ${SDL_CLOCK_GETTIME_DEFAULT})
343351
dep_option(SDL_X11 "Use X11 video driver" ${UNIX_SYS} "SDL_VIDEO" OFF)
344-
dep_option(SDL_X11_SHARED "Dynamically load X11 support" ON "SDL_X11" OFF)
352+
dep_option(SDL_X11_SHARED "Dynamically load X11 support" ON "SDL_X11;SDL_DEPS_SHARED" OFF)
345353
dep_option(SDL_X11_XCURSOR "Enable Xcursor support" ON SDL_X11 OFF)
346354
dep_option(SDL_X11_XDBE "Enable Xdbe support" ON SDL_X11 OFF)
347355
dep_option(SDL_X11_XINPUT "Enable XInput support" ON SDL_X11 OFF)
@@ -351,9 +359,9 @@ dep_option(SDL_X11_XSCRNSAVER "Enable Xscrnsaver support" ON SDL_X11 OFF)
351359
dep_option(SDL_X11_XSHAPE "Enable XShape support" ON SDL_X11 OFF)
352360
dep_option(SDL_X11_XSYNC "Enable Xsync support" ON SDL_X11 OFF)
353361
dep_option(SDL_WAYLAND "Use Wayland video driver" ${UNIX_SYS} "SDL_VIDEO" OFF)
354-
dep_option(SDL_WAYLAND_SHARED "Dynamically load Wayland support" ON "SDL_WAYLAND" OFF)
362+
dep_option(SDL_WAYLAND_SHARED "Dynamically load Wayland support" ON "SDL_WAYLAND;SDL_DEPS_SHARED" OFF)
355363
dep_option(SDL_WAYLAND_LIBDECOR "Use client-side window decorations on Wayland" ON "SDL_WAYLAND" OFF)
356-
dep_option(SDL_WAYLAND_LIBDECOR_SHARED "Dynamically load libdecor support" ON "SDL_WAYLAND_LIBDECOR;SDL_WAYLAND_SHARED" OFF)
364+
dep_option(SDL_WAYLAND_LIBDECOR_SHARED "Dynamically load libdecor support" ON "SDL_WAYLAND_LIBDECOR;SDL_WAYLAND_SHARED;SDL_DEPS_SHARED" OFF)
357365
dep_option(SDL_RPI "Use Raspberry Pi video driver" ON "SDL_VIDEO;UNIX_SYS;SDL_CPU_ARM32 OR SDL_CPU_ARM64" OFF)
358366
dep_option(SDL_ROCKCHIP "Use ROCKCHIP Hardware Acceleration video driver" ON "SDL_VIDEO;UNIX_SYS;SDL_CPU_ARM32 OR SDL_CPU_ARM64" OFF)
359367
dep_option(SDL_COCOA "Use Cocoa video driver" ON "APPLE" OFF)
@@ -373,14 +381,14 @@ dep_option(SDL_RENDER_WEBGPU "Enable the WebGPU render driver" ON "SDL_REN
373381
dep_option(SDL_METAL "Enable Metal support" ON "APPLE" OFF)
374382
set_option(SDL_OPENVR "Use OpenVR video driver" OFF)
375383
dep_option(SDL_KMSDRM "Use KMS DRM video driver" ${UNIX_SYS} "SDL_VIDEO" OFF)
376-
dep_option(SDL_KMSDRM_SHARED "Dynamically load KMS DRM support" ON "SDL_KMSDRM" OFF)
384+
dep_option(SDL_KMSDRM_SHARED "Dynamically load KMS DRM support" ON "SDL_KMSDRM;SDL_DEPS_SHARED" OFF)
377385
set_option(SDL_OFFSCREEN "Use offscreen video driver" ON)
378386
dep_option(SDL_DUMMYCAMERA "Support the dummy camera driver" ON SDL_CAMERA OFF)
379387
option_string(SDL_BACKGROUNDING_SIGNAL "number to use for magic backgrounding signal or 'OFF'" OFF)
380388
option_string(SDL_FOREGROUNDING_SIGNAL "number to use for magic foregrounding signal or 'OFF'" OFF)
381389
dep_option(SDL_HIDAPI "Enable the HIDAPI subsystem" ON "NOT VISIONOS" OFF)
382390
dep_option(SDL_HIDAPI_LIBUSB "Use libusb for low level joystick drivers" ON SDL_HIDAPI_LIBUSB_AVAILABLE OFF)
383-
dep_option(SDL_HIDAPI_LIBUSB_SHARED "Dynamically load libusb support" ON SDL_HIDAPI_LIBUSB OFF)
391+
dep_option(SDL_HIDAPI_LIBUSB_SHARED "Dynamically load libusb support" ON "SDL_HIDAPI_LIBUSB;SDL_DEPS_SHARED" OFF)
384392
dep_option(SDL_HIDAPI_JOYSTICK "Use HIDAPI for low level joystick drivers" ON SDL_HIDAPI OFF)
385393
dep_option(SDL_VIRTUAL_JOYSTICK "Enable the virtual-joystick driver" ON SDL_HIDAPI OFF)
386394
set_option(SDL_LIBUDEV "Enable libudev support" ON)
@@ -748,7 +756,7 @@ if(SDL_ASSEMBLY)
748756
if(SDL_SSE4_2)
749757
cmake_push_check_state()
750758
if(USE_GCC OR USE_CLANG OR USE_INTELCC)
751-
string(APPEND CMAKE_REQUIRED_FLAGS " -msse4.2")
759+
string(APPEND CMAKE_REQUIRED_FLAGS " -msse4.2 -mcrc32")
752760
endif()
753761
check_c_source_compiles("
754762
#include <nmmintrin.h>
@@ -2889,6 +2897,7 @@ elseif(N3DS)
28892897
set(SDL_THREAD_N3DS 1)
28902898
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/thread/n3ds/*.c")
28912899
sdl_sources(
2900+
"${SDL3_SOURCE_DIR}/src/thread/generic/SDL_syscond.c"
28922901
"${SDL3_SOURCE_DIR}/src/thread/generic/SDL_systls.c"
28932902
"${SDL3_SOURCE_DIR}/src/thread/generic/SDL_sysrwlock.c"
28942903
)

‎VisualC-GDK/SDL/SDL.vcxproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>
116116
</Midl>
117117
<ClCompile>
118+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
118119
<Optimization>Disabled</Optimization>
119120
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120121
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -145,6 +146,7 @@
145146
<TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>
146147
</Midl>
147148
<ClCompile>
149+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
148150
<Optimization>Disabled</Optimization>
149151
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150152
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -182,6 +184,7 @@
182184
<TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>
183185
</Midl>
184186
<ClCompile>
187+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
185188
<Optimization>Disabled</Optimization>
186189
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
187190
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -219,6 +222,7 @@
219222
<TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
220223
</Midl>
221224
<ClCompile>
225+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
222226
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
223227
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
224228
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -250,6 +254,7 @@
250254
<TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
251255
</Midl>
252256
<ClCompile>
257+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
253258
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
254259
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
255260
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -288,6 +293,7 @@
288293
<TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
289294
</Midl>
290295
<ClCompile>
296+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
291297
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
292298
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
293299
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -320,6 +326,7 @@
320326
</ItemDefinitionGroup>
321327
<ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
322328
<ClCompile>
329+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
323330
<TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
324331
</ClCompile>
325332
</ItemDefinitionGroup>
@@ -418,6 +425,7 @@
418425
<ClInclude Include="..\..\src\camera\SDL_syscamera.h" />
419426
<ClInclude Include="..\..\src\core\gdk\SDL_gdk.h" />
420427
<ClInclude Include="..\..\src\core\windows\SDL_directx.h" />
428+
<ClInclude Include="..\..\src\core\windows\SDL_gameinput.h" />
421429
<ClInclude Include="..\..\src\core\windows\SDL_hid.h" />
422430
<ClInclude Include="..\..\src\core\windows\SDL_immdevice.h" />
423431
<ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
@@ -633,6 +641,7 @@
633641
<ClCompile Include="..\..\src\audio\SDL_wave.c" />
634642
<ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
635643
<ClCompile Include="..\..\src\core\SDL_core_unsupported.c" />
644+
<ClCompile Include="..\..\src\core\windows\SDL_gameinput.c"/>
636645
<ClCompile Include="..\..\src\core\windows\SDL_hid.c" />
637646
<ClCompile Include="..\..\src\core\windows\SDL_immdevice.c" />
638647
<ClCompile Include="..\..\src\core\windows\SDL_windows.c" />

‎VisualC-GDK/SDL/SDL.vcxproj.filters‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<ClCompile Include="..\..\src\audio\SDL_wave.c" />
2828
<ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
2929
<ClCompile Include="..\..\src\core\SDL_core_unsupported.c" />
30+
<ClCompile Include="..\..\src\core\windows\SDL_gameinput.c" />
3031
<ClCompile Include="..\..\src\core\windows\SDL_hid.c" />
3132
<ClCompile Include="..\..\src\core\windows\SDL_immdevice.c" />
3233
<ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
@@ -314,6 +315,7 @@
314315
<ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />
315316
<ClInclude Include="..\..\src\core\gdk\SDL_gdk.h" />
316317
<ClInclude Include="..\..\src\core\windows\SDL_directx.h" />
318+
<ClInclude Include="..\..\src\core\windows\SDL_gameinput.h" />
317319
<ClInclude Include="..\..\src\core\windows\SDL_hid.h" />
318320
<ClInclude Include="..\..\src\core\windows\SDL_immdevice.h" />
319321
<ClInclude Include="..\..\src\core\windows\SDL_windows.h" />

‎VisualC-GDK/SDL_test/SDL_test.vcxproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Desktop.x64'">
104104
<Midl />
105105
<ClCompile>
106+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
106107
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107108
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
108109
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -117,6 +118,7 @@
117118
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.Scarlett.x64'">
118119
<Midl />
119120
<ClCompile>
121+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
120122
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121123
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
122124
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -131,6 +133,7 @@
131133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.XboxOne.x64'">
132134
<Midl />
133135
<ClCompile>
136+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
134137
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135138
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
136139
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -145,6 +148,7 @@
145148
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Desktop.x64'">
146149
<Midl />
147150
<ClCompile>
151+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
148152
<Optimization>Disabled</Optimization>
149153
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150154
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -159,6 +163,7 @@
159163
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.Scarlett.x64'">
160164
<Midl />
161165
<ClCompile>
166+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
162167
<Optimization>Disabled</Optimization>
163168
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
164169
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -173,6 +178,7 @@
173178
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.XboxOne.x64'">
174179
<Midl />
175180
<ClCompile>
181+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
176182
<Optimization>Disabled</Optimization>
177183
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
178184
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -186,6 +192,7 @@
186192
</ItemDefinitionGroup>
187193
<ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
188194
<ClCompile>
195+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
189196
<TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
190197
</ClCompile>
191198
</ItemDefinitionGroup>

‎VisualC-GDK/tests/testcontroller/testcontroller.vcxproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
122122
</Midl>
123123
<ClCompile>
124+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
124125
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125126
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
126127
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -144,6 +145,7 @@
144145
<TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
145146
</Midl>
146147
<ClCompile>
148+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
147149
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148150
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
149151
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -167,6 +169,7 @@
167169
<TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
168170
</Midl>
169171
<ClCompile>
172+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
170173
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171174
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
172175
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -190,6 +193,7 @@
190193
<TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
191194
</Midl>
192195
<ClCompile>
196+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
193197
<Optimization>Disabled</Optimization>
194198
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
195199
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -216,6 +220,7 @@
216220
<TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
217221
</Midl>
218222
<ClCompile>
223+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
219224
<Optimization>Disabled</Optimization>
220225
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
221226
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -242,6 +247,7 @@
242247
<TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
243248
</Midl>
244249
<ClCompile>
250+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
245251
<Optimization>Disabled</Optimization>
246252
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
247253
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -262,6 +268,7 @@
262268
</ItemDefinitionGroup>
263269
<ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
264270
<ClCompile>
271+
<AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
265272
<TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
266273
</ClCompile>
267274
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)