Branimir Karadžić hace 9 años
padre
commit
3adcc404cd
Se han modificado 1 ficheros con 21 adiciones y 19 borrados
  1. 21 19
      scripts/shaderc.lua

+ 21 - 19
scripts/shaderc.lua

@@ -6,6 +6,8 @@
 project "glslang"
 project "glslang"
 	kind "StaticLib"
 	kind "StaticLib"
 
 
+	local GLSLANG = path.join(BGFX_DIR, "3rdparty/glslang")
+
 	configuration { "vs2012" }
 	configuration { "vs2012" }
 		defines {
 		defines {
 			"atoll=_atoi64",
 			"atoll=_atoi64",
@@ -45,43 +47,43 @@ project "glslang"
 
 
 	configuration {}
 	configuration {}
 
 
+	flags {
+		"Optimize",
+	}
+
 	includedirs {
 	includedirs {
-		"../3rdparty/glslang",
+		GLSLANG,
 	}
 	}
 
 
 	files {
 	files {
-		"../3rdparty/glslang/glslang/**.cpp",
-		"../3rdparty/glslang/glslang/**.h",
-
-		"../3rdparty/glslang/hlsl/**.cpp",
-		"../3rdparty/glslang/hlsl/**.h",
+		path.join(GLSLANG, "glslang/**.cpp"),
+		path.join(GLSLANG, "glslang/**.h"),
 
 
-		"../3rdparty/glslang/SPIRV/**.cpp",
-		"../3rdparty/glslang/SPIRV/**.h",
+		path.join(GLSLANG, "hlsl/**.cpp"),
+		path.join(GLSLANG, "hlsl/**.h"),
 
 
-		"../3rdparty/glslang/OGLCompilersDLL/**.cpp",
-		"../3rdparty/glslang/OGLCompilersDLL/**.h",
+		path.join(GLSLANG, "SPIRV/**.cpp"),
+		path.join(GLSLANG, "SPIRV/**.h"),
 
 
-		"../3rdparty/glsl-parser/**.cpp",
-		"../3rdparty/glsl-parser/**.h",
+		path.join(GLSLANG, "OGLCompilersDLL/**.cpp"),
+		path.join(GLSLANG, "OGLCompilersDLL/**.h"),
 	}
 	}
 
 
 	removefiles {
 	removefiles {
-		"../3rdparty/glsl-parser/main.cpp",
-		"../3rdparty/glslang/glslang/OSDependent/Unix/main.cpp",
-		"../3rdparty/glslang/glslang/OSDependent/Windows/main.cpp",
+		path.join(GLSLANG, "glslang/OSDependent/Unix/main.cpp"),
+		path.join(GLSLANG, "glslang/OSDependent/Windows/main.cpp"),
 	}
 	}
 
 
 	configuration { "windows" }
 	configuration { "windows" }
 		removefiles {
 		removefiles {
-			"../3rdparty/glslang/glslang/OSDependent/Unix/**.cpp",
-			"../3rdparty/glslang/glslang/OSDependent/Unix/**.h",
+			path.join(GLSLANG, "glslang/OSDependent/Unix/**.cpp"),
+			path.join(GLSLANG, "glslang/OSDependent/Unix/**.h"),
 		}
 		}
 
 
 	configuration { "not windows" }
 	configuration { "not windows" }
 		removefiles {
 		removefiles {
-			"../3rdparty/glslang/glslang/OSDependent/Windows/**.cpp",
-			"../3rdparty/glslang/glslang/OSDependent/Windows/**.h",
+			path.join(GLSLANG, "glslang/OSDependent/Windows/**.cpp"),
+			path.join(GLSLANG, "glslang/OSDependent/Windows/**.h"),
 		}
 		}
 
 
 	configuration {}
 	configuration {}