ソースを参照

Merge branch 'master' of github.com:dbartolini/crown

Daniele Bartolini 8 年 前
コミット
ffb774da21

+ 1 - 0
scripts/crown.lua

@@ -111,6 +111,7 @@ function crown_project(_name, _kind, _defines)
 				"psapi",
 				"ws2_32",
 				"ole32",
+				"gdi32",
 			}
 
 		configuration {}

+ 1 - 1
scripts/genie.lua

@@ -64,7 +64,7 @@ crown_project("", "ConsoleApp", {})
 
 group "libs"
 dofile (BGFX_DIR .. "scripts/bgfx.lua")
-bgfxProject("", "StaticLib", os.is("windows") and { "BGFX_CONFIG_RENDERER_DIRECT3D9=1" } or {})
+bgfxProject("", "StaticLib")
 
 dofile (BX_DIR .. "scripts/bx.lua")
 dofile (BIMG_DIR .. "scripts/bimg.lua")

+ 1 - 0
scripts/level-editor-imgui.lua

@@ -60,6 +60,7 @@ project "level-editor-imgui"
 			"psapi",
 			"ws2_32",
 			"ole32",
+			"gdi32",
 			"luajit"
 		}
 

+ 1 - 1
src/resource/shader_resource.cpp

@@ -448,7 +448,7 @@ namespace shader_resource_internal
 		if (strcmp("windows", platform) == 0)
 		{
 			argv[11] = "--profile";
-			argv[12] = ((strcmp(type, "vertex") == 0) ? "vs_3_0" : "ps_3_0");
+			argv[12] = ((strcmp(type, "vertex") == 0) ? "vs_4_0" : "ps_4_0");
 		}
 
 		return opts.run_external_compiler(argv, output);