Skip to content

Commit 04f3b2d

Browse files
committed
fix conflict?
2 parents 6b71ec6 + ec43059 commit 04f3b2d

Some content is hidden

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

55 files changed

+1998
-1878
lines changed

.github/workflows/main.yml

+34-24
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ jobs:
288288
- uses: actions/setup-java@v4
289289
with:
290290
distribution: "zulu"
291-
java-version: 11
291+
java-version: 17
292292

293293
- uses: krdlab/setup-haxe@v1
294294
with:
@@ -466,10 +466,10 @@ jobs:
466466
name: iPhone-NDLL
467467
path: ndll/iPhone/
468468

469-
- uses: actions/download-artifact@v4
470-
with:
471-
name: Linux-NDLL
472-
path: ndll/Linux/
469+
# - uses: actions/download-artifact@v4
470+
# with:
471+
# name: Linux-NDLL
472+
# path: ndll/Linux/
473473

474474
- uses: actions/download-artifact@v4
475475
with:
@@ -606,7 +606,7 @@ jobs:
606606
runs-on: windows-latest
607607
strategy:
608608
matrix:
609-
haxe-version: [4.0.5, 4.1.5, 4.2.5, 4.3.1]
609+
haxe-version: [4.0.5, 4.1.5, 4.2.5, 4.3.6]
610610
steps:
611611

612612
- uses: actions/checkout@v4
@@ -715,7 +715,7 @@ jobs:
715715

716716
- uses: krdlab/setup-haxe@v1
717717
with:
718-
haxe-version: 4.3.3 # minimum required version for HL/C
718+
haxe-version: 4.3.3 # minimum required version for HL/C is 4.3.3
719719

720720
- name: Set HAXEPATH (Windows)
721721
if: runner.os == 'Windows'
@@ -756,60 +756,70 @@ jobs:
756756
lime build SimpleAudio hlc -release -verbose -nocolor
757757
758758
html5-samples:
759+
needs: package-haxelib
759760
runs-on: ubuntu-20.04
761+
strategy:
762+
matrix:
763+
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.6]
760764
steps:
761765

762766
- uses: actions/checkout@v4
763767

764768
- uses: krdlab/setup-haxe@v1
765769
with:
766-
haxe-version: ${{ env.HAXE_VERSION }}
770+
haxe-version: ${{ matrix.haxe-version }}
767771

768772
- name: Set HAXEPATH
769773
run: |
770774
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
771775
772776
- name: Install Haxe dependencies
773777
run: |
774-
haxelib install format --quiet
775-
haxelib install hxp --quiet
776778
haxelib install genes --quiet
777779
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
778780
781+
- uses: actions/download-artifact@v4
782+
with:
783+
name: lime-haxelib
784+
path: lime-haxelib
785+
779786
- name: Prepare Lime
780787
run: |
781-
haxelib dev lime ${{ github.workspace }}
782-
haxelib run lime setup -alias -y -nocffi -eval
788+
haxelib dev lime lime-haxelib
789+
haxelib run lime setup -alias -y -nocffi
783790
784791
- name: Build HelloWorld sample
785792
run: |
786-
lime create HelloWorld -verbose -nocolor -eval
787-
lime build HelloWorld html5 -release -verbose -nocolor -eval
793+
lime create HelloWorld -verbose -nocolor
794+
lime build HelloWorld html5 -release -verbose -nocolor
788795
789796
- name: Build HelloWorld variants
797+
if: ${{ matrix.haxe-version != '3.4.7' }}
790798
run: |
791-
lime build HelloWorld html5 -clean -release -verbose -nocolor --haxelib=genes -eval
792-
lime build HelloWorld html5 -clean -release -verbose -nocolor -minify -terser -eval
799+
lime build HelloWorld html5 -clean -release -verbose -nocolor --haxelib=genes
800+
lime build HelloWorld html5 -clean -release -verbose -nocolor -minify -terser
793801
794802
- name: Build SimpleImage sample
795803
run: |
796-
lime create SimpleImage -verbose -nocolor -eval
797-
lime build SimpleImage html5 -release -verbose -nocolor -eval
804+
lime create SimpleImage -verbose -nocolor
805+
lime build SimpleImage html5 -release -verbose -nocolor
798806
799807
- name: Build SimpleImage variants
808+
if: ${{ matrix.haxe-version != '3.4.7' }}
800809
run: |
801-
lime build SimpleImage html5 -clean -release -verbose -nocolor --haxelib=genes -eval
802-
lime build SimpleImage html5 -clean -release -verbose -nocolor -minify -terser -eval
810+
lime build SimpleImage html5 -clean -release -verbose -nocolor --haxelib=genes
811+
lime build SimpleImage html5 -clean -release -verbose -nocolor -minify -terser
803812
804813
- name: Build SimpleAudio sample
805814
run: |
806-
lime create SimpleAudio -verbose -nocolor -eval
807-
lime build SimpleAudio html5 -release -verbose -nocolor -eval
815+
lime create SimpleAudio -verbose -nocolor
816+
lime build SimpleAudio html5 -release -verbose -nocolor
808817
809818
- name: Build SimpleAudio variants
819+
if: ${{ matrix.haxe-version != '3.4.7' }}
810820
run: |
811-
lime build SimpleAudio html5 -clean -release -verbose -nocolor --haxelib=genes -eval
812-
lime build SimpleAudio html5 -clean -release -verbose -nocolor -minify -terser -eval
821+
lime build SimpleAudio html5 -clean -release -verbose -nocolor --haxelib=genes
822+
lime build SimpleAudio html5 -clean -release -verbose -nocolor -minify -terser
813823
814824
neko-samples:
815825
needs: package-haxelib

extraParams.hxml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
--macro lime._internal.macros.DefineMacro.run()
1+
--macro lime._internal.macros.DefineMacro.run()
2+
--macro haxe.macro.Compiler.addMetadata("@:autoBuild(lime._internal.macros.AssetsMacro.embedBytes())", "haxe.io.Bytes")

project/Build.xml

+3
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,13 @@
315315
<file name="src/system/CFFI.cpp" />
316316
<file name="src/system/CFFIPointer.cpp" />
317317
<file name="src/system/ClipboardEvent.cpp" />
318+
<file name="src/system/Display.mm" if="mac || ios" />
319+
<file name="src/system/Display.cpp" unless="mac || ios" />
318320
<file name="src/system/DisplayMode.cpp" />
319321
<file name="src/system/JNI.cpp" if="android" />
320322
<file name="src/system/Locale.cpp" unless="mac || ios" />
321323
<file name="src/system/Locale.mm" if="mac || ios" />
324+
<file name="src/system/OrientationEvent.cpp" />
322325
<file name="src/system/SensorEvent.cpp" />
323326
<file name="src/system/System.cpp" unless="ios" />
324327
<file name="src/system/System.mm" if="ios" />

project/include/system/Display.h

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#ifndef LIME_SYSTEM_DISPLAY_H
2+
#define LIME_SYSTEM_DISPLAY_H
3+
4+
#include <math/Rectangle.h>
5+
6+
namespace lime {
7+
8+
9+
class Display {
10+
11+
12+
public:
13+
14+
static void GetSafeAreaInsets (int displayIndex, Rectangle * rect);
15+
16+
17+
};
18+
19+
}
20+
21+
#endif
+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#ifndef LIME_SYSTEM_ORIENTATION_EVENT_H
2+
#define LIME_SYSTEM_ORIENTATION_EVENT_H
3+
4+
5+
#include <system/CFFI.h>
6+
#include <system/ValuePointer.h>
7+
8+
9+
namespace lime {
10+
11+
12+
enum OrientationEventType {
13+
14+
DISPLAY_ORIENTATION_CHANGE,
15+
DEVICE_ORIENTATION_CHANGE
16+
17+
};
18+
19+
20+
struct OrientationEvent {
21+
22+
hl_type* t;
23+
int orientation;
24+
int display;
25+
OrientationEventType type;
26+
27+
static ValuePointer* callback;
28+
static ValuePointer* eventObject;
29+
30+
OrientationEvent ();
31+
32+
static void Dispatch (OrientationEvent* event);
33+
34+
};
35+
36+
37+
}
38+
39+
40+
#endif

project/include/system/System.h

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ namespace lime {
4040
static bool GetIOSTablet ();
4141
#endif
4242
static int GetNumDisplays ();
43+
static int GetDeviceOrientation ();
4344
static std::wstring* GetPlatformLabel ();
4445
static std::wstring* GetPlatformName ();
4546
static std::wstring* GetPlatformVersion ();
@@ -53,6 +54,7 @@ namespace lime {
5354
#if defined(HX_WINDOWS) && !defined (HX_WINRT)
5455
static bool SetWindowsConsoleMode (int handleType, int mode);
5556
#endif
57+
static void EnableDeviceOrientationChange(bool enable);
5658

5759
private:
5860

project/lib/custom/sdl/include/SDL_config_macosx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
#define SDL_VIDEO_OPENGL_ES2 1
212212
#endif
213213
#ifndef SDL_VIDEO_OPENGL_EGL
214-
#define SDL_VIDEO_OPENGL_EGL 0
214+
#define SDL_VIDEO_OPENGL_EGL 1
215215
#endif
216216
#ifndef SDL_VIDEO_OPENGL_CGL
217217
#define SDL_VIDEO_OPENGL_CGL 1

project/lib/freetype-files.xml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcache.h" />
1717
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftchapters.h" />
1818
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcid.h" />
19+
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftcolor.h" />
1920
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftdriver.h" />
2021
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fterrdef.h" />
2122
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/fterrors.h" />
@@ -79,6 +80,7 @@
7980
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftbitmap.c" />
8081
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftcalc.c" />
8182
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftcid.c" />
83+
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftcolor.c" />
8284
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftdbgmem.c" />
8385
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftdebug.c" />
8486
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/base/ftfntfmt.c" />

project/lib/harfbuzz-files.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@
3030
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-buffer-verify.cc" />
3131
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-buffer.cc" />
3232
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-common.cc" />
33-
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-coretext.cc" if="mac || ios" />
33+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-coretext-shape.cc" if="mac || ios" />
3434
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-directwrite.cc" if="windows HXCPP_M64" />
35+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-draw.cc" />
3536
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-face.cc" />
37+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-face-builder.cc" />
3638
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-fallback-shape.cc" />
3739
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-font.cc" />
3840
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ft.cc" />
3941
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-number.cc" />
4042
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-cff1-table.cc" />
4143
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-cff2-table.cc" />
44+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-color.cc" />
4245
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-face.cc" />
4346
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-font.cc" />
4447
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-layout.cc" />
@@ -62,6 +65,9 @@
6265
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-shape.cc" />
6366
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-tag.cc" />
6467
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-ot-var.cc" />
68+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-outline.cc" />
69+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-paint.cc" />
70+
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-paint-extents.cc" />
6571
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-set.cc" />
6672
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-shape-plan.cc" />
6773
<file name="${NATIVE_TOOLKIT_PATH}/harfbuzz/src/hb-shape.cc" />

project/lib/sdl-files.xml

+22-3
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/sdl/include/" />
100100
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
101101
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/hidapi/" />
102+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/video/khronos/" />
102103
<compilerflag value="-I${SDL_CONFIG_PATH}" if="SDL_CONFIG_PATH" />
103104

104105
<compilerflag value="-DGL_GLEXT_PROTOTYPES" if="android || rpi" />
@@ -127,6 +128,7 @@
127128

128129
<section if="linux">
129130

131+
<compilerflag value="-DHAVE_LINUX_INPUT_H" />
130132
<compilerflag value="-DHAVE_LINUX_VERSION_H" />
131133
<compilerflag value="-D_REENTRANT" />
132134
<compilerflag value="-mmmx" unless="rpi" />
@@ -196,12 +198,16 @@
196198
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_quit.c" />
197199
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_touch.c" />
198200
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_windowevents.c" />
201+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_scancode_tables.c" />
202+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_keysym_to_scancode.c" />
199203
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/SDL_rwops.c" />
200204
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/SDL_haptic.c" />
201205
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/SDL_hidapi.c" />
206+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/controller_type.c" />
207+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
202208
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_gamecontroller.c" />
203209
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_joystick.c" />
204-
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
210+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_steam_virtual_gamepad.c" />
205211
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/virtual/SDL_virtualjoystick.c" />
206212
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_atan2.c" />
207213
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_exp.c" />
@@ -245,9 +251,12 @@
245251
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_hints.c" />
246252
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_list.c" />
247253
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_log.c" />
254+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_utils.c" />
255+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_guid.c" />
248256
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL.c" />
249257
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/dummy/SDL_dummysensor.c" />
250258
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/SDL_sensor.c" />
259+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc16.c" />
251260
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc32.c" />
252261
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_getenv.c" />
253262
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_iconv.c" />
@@ -281,7 +290,9 @@
281290
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_video.c" />
282291
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_vulkan_utils.c" />
283292
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_yuv.c" />
284-
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb.c" />
293+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_std.c" />
294+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_sse.c" />
295+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_lsx.c" />
285296

286297
<section unless="windows">
287298

@@ -294,7 +305,7 @@
294305

295306
</section>
296307

297-
<section if="android || ios || windows || rpi || tvos">
308+
<section if="android || ios || windows || rpi || tvos || mac">
298309

299310
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles/SDL_render_gles.c" />
300311
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles2/SDL_render_gles2.c" />
@@ -307,6 +318,7 @@
307318

308319
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c" />
309320
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_luna.c" />
321+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps3.c" />
310322
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c" />
311323
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c" />
312324
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c" />
@@ -316,6 +328,10 @@
316328
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c" />
317329
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c" />
318330
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c" />
331+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_shield.c" />
332+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_combined.c" />
333+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_wii.c" />
334+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_steamdeck.c" />
319335
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapijoystick.c" />
320336

321337
</section>
@@ -455,6 +471,7 @@
455471
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/winmm/SDL_winmm.c" />
456472
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_windows.c" />
457473
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_xinput.c" />
474+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_immdevice.c" />
458475
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_dinputhaptic.c" />
459476
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_windowshaptic.c" />
460477
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_xinputhaptic.c" />
@@ -464,6 +481,7 @@
464481
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_xinputjoystick.c" />
465482
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/loadso/windows/SDL_sysloadso.c" />
466483
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
484+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d12/SDL_render_d3d12.c" />
467485
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/SDL_d3dmath.c" />
468486
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/generic/SDL_syscond.c" />
469487
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/windows/SDL_sysmutex.c" />
@@ -509,6 +527,7 @@
509527
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/winrt/SDL_sysurl.cpp" />
510528
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/winrt/SDL_syspower.cpp" />
511529
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
530+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d12/SDL_render_d3d12.c" />
512531
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_winrt.cpp" />
513532
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_shaders_d3d11.c" />
514533
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtevents.cpp" />

0 commit comments

Comments
 (0)