Merge branch 'master' into server

.gitlab-ci.yml

@@ -30,18 +30,18 @@ mat_linux:
     - apt update; apt -y install git wget tar
     #- git clone --depth=1 https://code.mycard.moe/mycard/irrlicht irrlicht_linux
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-linux.tar.gz | tar zfx -
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
-    - cd libevent-2.0.22-stable
-    - ./configure --prefix=$PWD/libevent-stable --disable-openssl
-    - make -j$(nproc)
-    - make install
-    - cd ..
-    - mv libevent-2.0.22-stable/libevent-stable .
+    #- wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+    #- cd libevent-2.0.22-stable
+    #- ./configure --prefix=$PWD/libevent-stable --disable-openssl
+    #- make -j$(nproc)
+    #- make install
+    #- cd ..
+    #- mv libevent-2.0.22-stable/libevent-stable .
   artifacts:
     paths:
       - premake5
       #- irrlicht_linux
-      - libevent-stable
+      #- libevent-stable
 
 mat_windows:
   stage: prepare
@@ -95,8 +95,8 @@ exec_linux:
     - linux
   variables:
     YGOPRO_BUILD_LUA: '1'
-    YGOPRO_LINUX_ALL_STATIC: '1'
-    YGOPRO_LINUX_ALL_STATIC_LIB_PATH: '/usr/lib/x86_64-linux-gnu/'
+    #YGOPRO_LINUX_ALL_STATIC: '1'
+    #YGOPRO_LINUX_ALL_STATIC_LIB_PATH: '/usr/lib/x86_64-linux-gnu/'
   dependencies:
     - mat_lua
     #- mat_irrklang