Skip to content

Y
ygopro
Commit 8d02eb88 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 3b983c88 ab58d150
Pipeline #15252 passed with stages
        in 3 minutes and 29 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        premake5.lua
        View file @ 8d02eb88
        ......@@ -205,7 +205,7 @@ if os.istarget("macosx") then
        if GetParam("mac-arm") then
        MAC_ARM = true
        end
        ON_MAC_ARM = MAC_ARM or io.popen('arch'):read('*l') == "arm64"
        ON_MAC_ARM = MAC_ARM or os.outputof("arch") == "arm64"
        end
        if GetParam("server-mode") then
        SERVER_MODE = true
        ......@@ -222,7 +222,7 @@ end
        workspace "YGOPro"
        location "build"
        language "C++"
        objdir "obj"
        objdir "obj"
        configurations { "Release", "Debug" }
        ......
        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