Merge branch 'develop' into server-develop

7 jobs for server-develop in 2 minutes and 43 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Prepare
passed #162654
linux
mat_common

00:00:13

passed #162656
linux
mat_linux

00:01:03

passed #162655
linux
mat_submodules

00:00:49

passed #162657
linux
mat_windows

00:00:24

 
  Build
passed #162660
linux
exec_debian

00:01:08

failed #162659
linux
exec_linux

00:01:34

failed #162658
vs
exec_windows

00:01:39

 
Name Stage Failure
failed
exec_windows Build
       (Link Ŀ��) -> 
gframe.obj : error LNK2001: �޷��������ⲿ���� "bool __cdecl ygo::IsExtension(char const *,char const *)" (?IsExtension@ygo@@YA_NPBD0@Z) [C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\build\ygopro.vcxproj]
..\bin\release\ygopro.exe : fatal error LNK1120: 1 ���޷��������ⲿ���� [C:\images\builds\nvYJyXaZ\0\nanahira\ygopro\build\ygopro.vcxproj]

29 ������
2 ������

����ʱ�� 00:00:46.77
ERROR: Job failed: exit status 1
failed
exec_linux Build
make[1]: *** [ygopro.make:142: ../obj/Release/ygopro/game.o] Error 1
make[1]: *** [ygopro.make:136: ../obj/Release/ygopro/data_manager.o] Error 1
make[1]: *** [ygopro.make:139: ../obj/Release/ygopro/deck_manager.o] Error 1
make[1]: *** [ygopro.make:148: ../obj/Release/ygopro/netserver.o] Error 1
make[1]: *** [ygopro.make:157: ../obj/Release/ygopro/tag_duel.o] Error 1
make[1]: *** [ygopro.make:154: ../obj/Release/ygopro/single_duel.o] Error 1
make: *** [Makefile:57: ygopro] Error 2
Cleaning up project directory and file based variables
ERROR: Job failed: exit code 1