Merge branch 'server' into side5

.gitlab-ci.yml

@@ -34,7 +34,10 @@ mat_submodules:
   stage: prepare
   tags: 
     - linux
-  script: git submodule update --init
+  script:
+    - rm -rf ocgcore script
+    - mkdir ocgcore script
+    - git submodule update --init
   artifacts:
     paths:
       - ocgcore
@@ -76,8 +79,8 @@ mat_windows:
 
 ._exec_build:
   stage: build
-  variables:
-    YGOPRO_NO_LUA_SAFE: '1' # on client no lua safe
+  #variables:
+  #  YGOPRO_NO_LUA_SAFE: '1' # on client no lua safe
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:

appveyor.yml

@@ -7,13 +7,8 @@ install:
   - git submodule update --init --recursive
 
   # environment and system dependency
-<<<<<<< HEAD
-  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-windows.zip ; exit 0"
-  - 7z x -y premake-5.0.0-alpha14-windows.zip
-=======
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-windows.zip ; exit 0"
   - 7z x premake-5.0.0-beta1-windows.zip
->>>>>>> 57ec431355b6eada0eeb74f1a54f0c1e83fa1ba5
   
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz ; exit 0"
   - tar xf libevent-2.0.22-stable.tar.gz
@@ -37,7 +32,7 @@ install:
 configuration: Release
 
 build: 
-    project: build/ygo.sln
+    project: build/YGOPro.sln
     parallel: true
 
 after_build:
@@ -96,11 +91,5 @@ deploy:
 cache:
   - premake-5.0.0-beta1-windows.zip
   - libevent-2.0.22-stable.tar.gz
-<<<<<<< HEAD
-  - freetype-2.10.1.tar.gz
-  - lua-5.3.5.tar.gz 
-  - irrlicht-1.8.4.zip
-=======
   - lua-5.3.6.tar.gz
->>>>>>> 57ec431355b6eada0eeb74f1a54f0c1e83fa1ba5
   - sqlite-amalgamation-3310100.zip

gframe/premake5.lua

@@ -22,7 +22,7 @@ if SERVER_MODE then
 else
     kind "WindowedApp"
 
-    files { "*.cpp", "*.h", "CGUISkinSystem/*.cpp", "CGUISkinSystem/*.h", "CXMLRegistry/*.cpp", "CXMLRegistry/*.h" }
+    files { "*.cpp", "*.h" }
     includedirs { "../ocgcore" }
     links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" }
 end
@@ -76,7 +76,6 @@ end
             links { "irrKlang" }
             if IRRKLANG_PRO then
                 defines { "IRRKLANG_STATIC" }
-                links { "ikpmp3" }
                 filter { "not configurations:Debug" }
                     libdirs { IRRKLANG_PRO_RELEASE_LIB_DIR }
                 filter { "configurations:Debug" }

premake5.lua

@@ -212,52 +212,16 @@ if SERVER_MODE then
     BUILD_IRRLICHT = false
     BUILD_IKPMP3 = false
     USE_IRRKLANG = false
+    IRRKLANG_PRO = false
 end
 
 workspace "YGOPro"
     location "build"
     language "C++"
     objdir "obj"
-    if os.ishost("macosx") then
-        BUILD_LUA=true
-    end
-    if not os.ishost("windows") then
-        if os.getenv("YGOPRO_BUILD_LUA") then
-            BUILD_LUA=true
-        end
-        if os.getenv("YGOPRO_BUILD_SQLITE") then
-            BUILD_SQLITE=true
-        end
-        if os.getenv("YGOPRO_BUILD_FREETYPE") then
-            BUILD_FREETYPE=true
-        end
-        if os.getenv("YGOPRO_BUILD_ALL") or os.ishost("macosx") then
-            BUILD_ALL=true
-        end
-        if os.getenv("YGOPRO_LIBEVENT_STATIC_PATH") then
-            LIBEVENT_ROOT=os.getenv("YGOPRO_LIBEVENT_STATIC_PATH")
-        end
-        if BUILD_ALL then
-            BUILD_LUA=true
-            BUILD_SQLITE=true
-            BUILD_FREETYPE=true
-        end
-        if os.ishost("macosx") then
-            if os.getenv("YGOPRO_TARGET_ARM") then
-                MAC_ARM=true
-            end
-        end
-    end
-    if (os.ishost("windows") or os.getenv("USE_IRRKLANG")) and not os.getenv("NO_IRRKLANG") then
-        USE_IRRKLANG = true
-        if os.getenv("irrklang_pro") then
-            IRRKLANG_PRO = true
-        end
-    end
 
     configurations { "Release", "Debug" }
 
-
     for _, numberOption in ipairs(numberOptions) do
         ApplyNumber(numberOption)
     end
@@ -266,7 +230,6 @@ workspace "YGOPro"
         ApplyBoolean(boolOption)
     end
 
-
     filter "system:windows"
         defines { "WIN32", "_WIN32" }
 if not SERVER_MODE then