Merge branch 'master' of ../ygopro-7210srv

9a3113c6 · nanahira · 3e9b7f14 · 882343bf · 9a3113c6 · 9a3113c6
Commit 9a3113c6 authored Dec 21, 2017 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

cards.cdb cards.cdb +0 -0

premake4.lua premake4.lua +1 -2

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/premake4.lua
+++ b/premake4.lua
@@ -2,10 +2,9 @@ solution "ygo"
    location "build"
    language "C++"
    objdir "obj"
-	startproject "ygopro"

    configurations { "Debug", "Release" }
-	defines { "LUA_COMPAT_5_2" }
+	 defines { "LUA_COMPAT_5_2" }

    configuration "windows"
        defines { "WIN32", "_WIN32" }