Skip to content

Y
ygopro-2pick
Commit 1a45ff16 authored by nanahira's avatar nanahira
Browse files
Options

fixmg

parent c8b2367a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 13 deletions
premake5.lua
View file @ 1a45ff16
...@@ -2,7 +2,6 @@ solution "ygo" ...@@ -2,7 +2,6 @@ solution "ygo"
location "build" location "build"
language "C++" language "C++"
objdir "obj" objdir "obj"
<<<<<<< HEAD
if os.ishost("windows") or os.getenv("USE_IRRKLANG") then if os.ishost("windows") or os.getenv("USE_IRRKLANG") then
USE_IRRKLANG = true USE_IRRKLANG = true
if os.getenv("irrklang_pro") then if os.getenv("irrklang_pro") then
...@@ -13,18 +12,6 @@ solution "ygo" ...@@ -13,18 +12,6 @@ solution "ygo"
configurations { "Debug", "Release" } configurations { "Debug", "Release" }
defines { "LUA_COMPAT_5_2" } defines { "LUA_COMPAT_5_2" }
=======
if os.ishost("windows") or os.getenv("USE_IRRKLANG") then
USE_IRRKLANG = true
if os.getenv("irrklang_pro") then
IRRKLANG_PRO = true
end
end
startproject "ygopro"
configurations { "Debug", "Release" }
defines { "LUA_COMPAT_5_2" }
>>>>>>> mactest
configuration "windows" configuration "windows"
defines { "WIN32", "_WIN32", "WINVER=0x0501" } defines { "WIN32", "_WIN32", "WINVER=0x0501" }
......
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