Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro
Commits
254a3d54
Commit
254a3d54
authored
Jun 27, 2025
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge things
parent
891e6558
Pipeline
#38138
failed with stages
in 86 minutes and 54 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
premake5.lua
premake5.lua
+0
-12
No files found.
premake5.lua
View file @
254a3d54
...
@@ -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
=======
>>>>>>>
398
bb2bd44567c62089ea2ebba9b1effce34da3b
-- 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
=
""
}
=======
>>>>>>>
398
bb2bd44567c62089ea2ebba9b1effce34da3b
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"
,
>>>>>>>
398
bb2bd44567c62089ea2ebba9b1effce34da3b
}
}
for
_
,
boolOption
in
ipairs
(
boolOptions
)
do
for
_
,
boolOption
in
ipairs
(
boolOptions
)
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment