Merge branch 'develop-nanahira' into 'develop'

Develop update

See merge request !1
11 jobs for develop in 6 minutes and 28 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Prepare
passed #143909
linux
mat_common

00:00:25

passed #143911
linux
mat_irrklang

00:00:55

passed #143912
linux
mat_linux

00:01:19

passed #143913
linux
mat_macos

00:00:36

passed #143910
linux
mat_submodules

00:01:10

passed #143914
linux
mat_windows

00:00:29

 
  Build
failed #143916
linux
exec_linux

00:05:07

failed #143918
macos-m1
exec_macos_platform_m1

00:01:06

failed #143917
macos
exec_macos_platform_x86

00:02:58

failed #143915
vs
exec_windows

00:03:58

 
  Combine
skipped #143919
macos
exec_macos
 
Name Stage Failure
failed
exec_linux Build
                 from ../gframe/single_mode.h:6,
from ../gframe/single_mode.cpp:1:
../gframe/../ocgcore/ocgapi.h:56:33: note: declared here
56 | extern "C" DECL_DLLEXPORT int32 preload_script(intptr_t pduel, const char* script, int32 len);
| ^~~~~~~~~~~~~~
make[1]: *** [YGOPro.make:231: ../obj/Release/YGOPro/single_mode.o] Error 1
make: *** [Makefile:61: YGOPro] Error 2
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
exec_windows Build
         C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\gframe\single_mode.cpp(66,5): error C2660: ��preload_script��: ���������� 2 ������ [C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\build\YGOPro.vcxproj]
C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\gframe\single_mode.cpp(70,6): error C2660: ��preload_script��: ���������� 2 ������ [C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\build\YGOPro.vcxproj]
C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\gframe\single_mode.cpp(78,5): error C2660: ��preload_script��: ���������� 2 ������ [C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\build\YGOPro.vcxproj]

301 ������
4 ������

����ʱ�� 00:02:28.27
ERROR: Job failed: exit status 1
failed
exec_macos_platform_x86 Build
                    ^~~~~~~~~~~~~~
../gframe/../ocgcore/ocgapi.h:56:33: note: candidate function not viable: requires 3 arguments, but 2 were provided
extern "C" DECL_DLLEXPORT int32 preload_script(intptr_t pduel, const char* script, int32 len);
^
3 errors generated.
make[1]: *** [../obj/Release/YGOPro/single_mode.o] Error 1
make: *** [YGOPro] Error 2
Cleaning up project directory and file based variables
ERROR: Job failed: exit status 1

failed
exec_macos_platform_m1 Build
                    ^~~~~~~~~~~~~~
../gframe/../ocgcore/ocgapi.h:56:33: note: candidate function not viable: requires 3 arguments, but 2 were provided
extern "C" DECL_DLLEXPORT int32 preload_script(intptr_t pduel, const char* script, int32 len);
^
3 errors generated.
make[1]: *** [../obj/Release/YGOPro/single_mode.o] Error 1
make: *** [YGOPro] Error 2
Cleaning up project directory and file based variables
ERROR: Job failed: exit status 1