Browse Source

Fix code based on review in libsdl_gfx

PucklaMotzer09 5 years ago
parent
commit
c8631c21c1
1 changed files with 5 additions and 12 deletions
  1. 5 12
      packages/l/libsdl_gfx/xmake.lua

+ 5 - 12
packages/l/libsdl_gfx/xmake.lua

@@ -26,28 +26,21 @@ package("libsdl_gfx")
     on_install("windows", function(package)
     on_install("windows", function(package)
         local file_name = "SDL2_gfx.vcxproj"
         local file_name = "SDL2_gfx.vcxproj"
         local content = io.readfile(file_name)
         local content = io.readfile(file_name)
-
         content = content:gsub("%%%(AdditionalIncludeDirectories%)", package:dep("libsdl"):installdir("include", "SDL2") .. ";%%%(AdditionalIncludeDirectories%)")
         content = content:gsub("%%%(AdditionalIncludeDirectories%)", package:dep("libsdl"):installdir("include", "SDL2") .. ";%%%(AdditionalIncludeDirectories%)")
         content = content:gsub("%%%(AdditionalLibraryDirectories%)", package:dep("libsdl"):installdir("lib") .. ";%%%(AdditionalLibraryDirectories%)")
         content = content:gsub("%%%(AdditionalLibraryDirectories%)", package:dep("libsdl"):installdir("lib") .. ";%%%(AdditionalLibraryDirectories%)")
-
         io.writefile(file_name, content)
         io.writefile(file_name, content)
 
 
         local configs = {}
         local configs = {}
-        local build_dir = ""
-
-        if package:arch() == "x86" then
-            build_dir = "Win32"
-        else
-            build_dir = "x64"
-        end
+        local arch = package:is_arch("x86") and "Win32" or "x64"
+        local mode = package:debug() and "Debug" or "Release"
 
 
-        table.insert(configs, "/property:Configuration=Release")
-        table.insert(configs, "/property:Platform=" .. build_dir)
+        table.insert(configs, "/property:Configuration=" .. mode)
+        table.insert(configs, "/property:Platform=" .. arch)
         table.insert(configs, "-target:SDL2_gfx")
         table.insert(configs, "-target:SDL2_gfx")
 
 
         import("package.tools.msbuild").build(package, configs)
         import("package.tools.msbuild").build(package, configs)
 
 
-        build_dir = path.join(build_dir, "Release")
+        local build_dir = path.join(arch, mode)
         os.cp(path.join(build_dir, "*.lib"), package:installdir("lib"))
         os.cp(path.join(build_dir, "*.lib"), package:installdir("lib"))
         os.cp(path.join(build_dir, "*.dll"), package:installdir("lib"))
         os.cp(path.join(build_dir, "*.dll"), package:installdir("lib"))
         os.cp("*.h", package:installdir("include", "SDL2"))
         os.cp("*.h", package:installdir("include", "SDL2"))