Commit 254a3d54 authored by nanahira's avatar nanahira

fix merge things

parent 891e6558
Pipeline #38138 failed with stages
in 86 minutes and 54 seconds
...@@ -29,12 +29,8 @@ IRRKLANG_PRO_BUILD_IKPMP3 = false ...@@ -29,12 +29,8 @@ IRRKLANG_PRO_BUILD_IKPMP3 = false
SERVER_MODE = true SERVER_MODE = true
SERVER_ZIP_SUPPORT = false SERVER_ZIP_SUPPORT = false
SERVER_PRO2_SUPPORT = false SERVER_PRO2_SUPPORT = false
<<<<<<< HEAD
SERVER_PRO3_SUPPORT = false SERVER_PRO3_SUPPORT = false
SERVER_TAG_SURRENDER_CONFIRM = false
USE_IRRKLANG = false USE_IRRKLANG = false
=======
>>>>>>> 398bb2bd44567c62089ea2ebba9b1effce34da3b
-- Read settings from command line or environment variables -- Read settings from command line or environment variables
...@@ -100,26 +96,18 @@ newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile f ...@@ -100,26 +96,18 @@ newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile f
newoption { trigger = "server-mode", category = "YGOPro - server", description = "" } newoption { trigger = "server-mode", category = "YGOPro - server", description = "" }
newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" } newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" }
newoption { trigger = "server-pro2-support", category = "YGOPro - server", description = "" } newoption { trigger = "server-pro2-support", category = "YGOPro - server", description = "" }
<<<<<<< HEAD
newoption { trigger = "server-pro3-support", category = "YGOPro - server", description = "" } newoption { trigger = "server-pro3-support", category = "YGOPro - server", description = "" }
newoption { trigger = "server-tag-surrender-confirm", category = "YGOPro - server", description = "" }
=======
>>>>>>> 398bb2bd44567c62089ea2ebba9b1effce34da3b
boolOptions = { boolOptions = {
"compat-mycard", "compat-mycard",
"no-lua-safe", "no-lua-safe",
<<<<<<< HEAD
"message-debug", "message-debug",
"no-side-check", "no-side-check",
"enable-debug-func", "enable-debug-func",
"log-lua-memory-size", "log-lua-memory-size",
"log-in-chat", "log-in-chat",
=======
"no-side-check",
"server-tag-surrender-confirm", "server-tag-surrender-confirm",
"server-receive-ready", "server-receive-ready",
>>>>>>> 398bb2bd44567c62089ea2ebba9b1effce34da3b
} }
for _, boolOption in ipairs(boolOptions) do for _, boolOption in ipairs(boolOptions) do
......
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