Merge branch 'nolink' into another

d5d2b3aa · nanahira · fd2a00c6 · 5c6d14f2 · d5d2b3aa · d5d2b3aa
Commit d5d2b3aa authored Apr 14, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

gframe/premake4.lua gframe/premake4.lua +6 -0

premake5.lua premake5.lua +0 -6

No files found.
--- a/gframe/premake4.lua
+++ b/gframe/premake4.lua
@@ -15,6 +15,12 @@ project "ygopro"
            defines { "IRRKLANG_STATIC" }
        end
    end
+    if os.getenv("YGOPRO_COMPAT_MYCARD") then
+        defines { "YGOPRO_COMPAT_MYCARD" }
+    end
+    if os.getenv("YGOPRO_IGNORE_SELECT_UNSELECT") then
+        defines { "YGOPRO_IGNORE_SELECT_UNSELECT" }
+    end

    configuration "windows"
        files "ygopro.rc"

--- a/premake5.lua
+++ b/premake5.lua
@@ -11,12 +11,6 @@ solution "ygo"

    configurations { "Debug", "Release" }
    defines { "LUA_COMPAT_5_2" }
-    if os.getenv("YGOPRO_COMPAT_MYCARD") then
-        defines { "YGOPRO_COMPAT_MYCARD" }
-    end
-    if os.getenv("YGOPRO_IGNORE_SELECT_UNSELECT") then
-        defines { "YGOPRO_IGNORE_SELECT_UNSELECT" }
-    end
    configuration "windows"
        defines { "WIN32", "_WIN32", "WINVER=0x0501" }
        libdirs { "$(DXSDK_DIR)Lib/x86" }