Commit 0777bd73 authored by nanahira's avatar nanahira

Merge branch 'server' into side5

parents 339c1780 b81244f7
...@@ -34,7 +34,10 @@ mat_submodules: ...@@ -34,7 +34,10 @@ mat_submodules:
stage: prepare stage: prepare
tags: tags:
- linux - linux
script: git submodule update --init script:
- rm -rf ocgcore script
- mkdir ocgcore script
- git submodule update --init
artifacts: artifacts:
paths: paths:
- ocgcore - ocgcore
...@@ -76,8 +79,8 @@ mat_windows: ...@@ -76,8 +79,8 @@ mat_windows:
._exec_build: ._exec_build:
stage: build stage: build
variables: #variables:
YGOPRO_NO_LUA_SAFE: '1' # on client no lua safe # YGOPRO_NO_LUA_SAFE: '1' # on client no lua safe
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths: paths:
......
...@@ -7,13 +7,8 @@ install: ...@@ -7,13 +7,8 @@ install:
- git submodule update --init --recursive - git submodule update --init --recursive
# environment and system dependency # 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" - 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 - 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" - 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 - tar xf libevent-2.0.22-stable.tar.gz
...@@ -37,7 +32,7 @@ install: ...@@ -37,7 +32,7 @@ install:
configuration: Release configuration: Release
build: build:
project: build/ygo.sln project: build/YGOPro.sln
parallel: true parallel: true
after_build: after_build:
...@@ -96,11 +91,5 @@ deploy: ...@@ -96,11 +91,5 @@ deploy:
cache: cache:
- premake-5.0.0-beta1-windows.zip - premake-5.0.0-beta1-windows.zip
- libevent-2.0.22-stable.tar.gz - 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 - lua-5.3.6.tar.gz
>>>>>>> 57ec431355b6eada0eeb74f1a54f0c1e83fa1ba5
- sqlite-amalgamation-3310100.zip - sqlite-amalgamation-3310100.zip
...@@ -22,7 +22,7 @@ if SERVER_MODE then ...@@ -22,7 +22,7 @@ if SERVER_MODE then
else else
kind "WindowedApp" kind "WindowedApp"
files { "*.cpp", "*.h", "CGUISkinSystem/*.cpp", "CGUISkinSystem/*.h", "CXMLRegistry/*.cpp", "CXMLRegistry/*.h" } files { "*.cpp", "*.h" }
includedirs { "../ocgcore" } includedirs { "../ocgcore" }
links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" } links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" }
end end
...@@ -76,7 +76,6 @@ end ...@@ -76,7 +76,6 @@ end
links { "irrKlang" } links { "irrKlang" }
if IRRKLANG_PRO then if IRRKLANG_PRO then
defines { "IRRKLANG_STATIC" } defines { "IRRKLANG_STATIC" }
links { "ikpmp3" }
filter { "not configurations:Debug" } filter { "not configurations:Debug" }
libdirs { IRRKLANG_PRO_RELEASE_LIB_DIR } libdirs { IRRKLANG_PRO_RELEASE_LIB_DIR }
filter { "configurations:Debug" } filter { "configurations:Debug" }
......
...@@ -212,52 +212,16 @@ if SERVER_MODE then ...@@ -212,52 +212,16 @@ if SERVER_MODE then
BUILD_IRRLICHT = false BUILD_IRRLICHT = false
BUILD_IKPMP3 = false BUILD_IKPMP3 = false
USE_IRRKLANG = false USE_IRRKLANG = false
IRRKLANG_PRO = false
end end
workspace "YGOPro" workspace "YGOPro"
location "build" location "build"
language "C++" language "C++"
objdir "obj" 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" } configurations { "Release", "Debug" }
for _, numberOption in ipairs(numberOptions) do for _, numberOption in ipairs(numberOptions) do
ApplyNumber(numberOption) ApplyNumber(numberOption)
end end
...@@ -266,7 +230,6 @@ workspace "YGOPro" ...@@ -266,7 +230,6 @@ workspace "YGOPro"
ApplyBoolean(boolOption) ApplyBoolean(boolOption)
end end
filter "system:windows" filter "system:windows"
defines { "WIN32", "_WIN32" } defines { "WIN32", "_WIN32" }
if not SERVER_MODE then if not SERVER_MODE then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment