Просмотр исходного кода

bgfx: fix rules (#3906)

* bgfx: fix rules

* Update xmake.lua

---------

Co-authored-by: ruki <[email protected]>
hsz 1 год назад
Родитель
Сommit
4107885513
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      packages/b/bgfx/rules/shaders.lua
  2. 1 1
      packages/b/bgfx/xmake.lua

+ 3 - 3
packages/b/bgfx/rules/shaders.lua

@@ -73,9 +73,9 @@ rule("shaders")
         }
         }
         local bgfx_default_profiles = {
         local bgfx_default_profiles = {
             windows = {
             windows = {
-                vertex = {dx9 = "vs_3_0", dx11 = "vs_5_0", glsl = "120"},
-                fragment = {dx9 = "ps_3_0", dx11 = "ps_5_0", glsl = "120"},
-                compute = {dx11 = "cs_5_0", glsl = "430"},
+                vertex = {dx9 = "s_3_0", dx11 = "s_5_0", glsl = "120"},
+                fragment = {dx9 = "s_3_0", dx11 = "s_5_0", glsl = "120"},
+                compute = {dx11 = "s_5_0", glsl = "430"},
             },
             },
             macosx = {
             macosx = {
                 vertex = {metal = "metal", glsl = "120"},
                 vertex = {metal = "metal", glsl = "120"},

+ 1 - 1
packages/b/bgfx/xmake.lua

@@ -37,7 +37,7 @@ package("bgfx")
         package:add("defines", "BX_CONFIG_DEBUG=" .. (package:debug() and "1" or "0"))
         package:add("defines", "BX_CONFIG_DEBUG=" .. (package:debug() and "1" or "0"))
     end)
     end)
 
 
-    on_install("windows", "macosx", "linux", function (package)
+    on_install("windows|native", "macosx", "linux", function (package)
         local bxdir = package:resourcefile("bx")
         local bxdir = package:resourcefile("bx")
         local bimgdir = package:resourcefile("bimg")
         local bimgdir = package:resourcefile("bimg")
         local genie = is_host("windows") and "genie.exe" or "genie"
         local genie = is_host("windows") and "genie.exe" or "genie"