Преглед изворни кода

Fixed paths in premake scripts (thanks to @gtbass for vs2012 premake fixes).

bkaradzic пре 13 година
родитељ
комит
e156d965d1

+ 1 - 1
premake/example-00-helloworld.lua

@@ -3,7 +3,7 @@ project "example-00-helloworld"
 	kind "WindowedApp"
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 	}
 

+ 1 - 1
premake/example-01-cubes.lua

@@ -5,7 +5,7 @@ project "example-01-cubes"
 	debugdir (BGFX_DIR .. "examples/runtime/")
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 	}
 

+ 1 - 1
premake/example-02-metaballs.lua

@@ -5,7 +5,7 @@ project "example-02-metaballs"
 	debugdir (BGFX_DIR .. "examples/runtime/")
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 	}
 

+ 1 - 1
premake/example-03-raymarch.lua

@@ -5,7 +5,7 @@ project "example-03-raymarch"
 	debugdir (BGFX_DIR .. "examples/runtime/")
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 	}
 

+ 1 - 1
premake/example-04-mesh.lua

@@ -10,7 +10,7 @@ project "example-04-mesh"
 	}
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 		BGFX_DIR .. "3rdparty/openctm/lib",
 	}

+ 1 - 1
premake/example-05-instancing.lua

@@ -5,7 +5,7 @@ project "example-05-instancing"
 	debugdir (BGFX_DIR .. "examples/runtime/")
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 	}
 

+ 1 - 1
premake/example-06-bump.lua

@@ -5,7 +5,7 @@ project "example-06-bump"
 	debugdir (BGFX_DIR .. "examples/runtime/")
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 	}
 

+ 1 - 1
premake/makedisttex.lua

@@ -3,7 +3,7 @@ project "makedisttex"
 	kind "ConsoleApp"
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "3rdparty/edtaa3",
 		BGFX_DIR .. "3rdparty/stb_image",
 	}

+ 16 - 4
premake/premake4.lua

@@ -154,13 +154,19 @@ configuration { "vs*" }
 configuration { "x32", "vs*" }
 	targetdir (BGFX_BUILD_DIR .. "win32_" .. _ACTION .. "/bin")
 	objdir (BGFX_BUILD_DIR .. "win32_" .. _ACTION .. "/obj")
-	libdirs { BGFX_THIRD_PARTY_DIR .. "lib/win32_" .. _ACTION }
+	libdirs {
+		BGFX_THIRD_PARTY_DIR .. "lib/win32_" .. _ACTION,
+		"$(DXSDK_DIR)/lib/x86",
+	}
 
 configuration { "x64", "vs*" }
 	defines { "_WIN64" }
 	targetdir (BGFX_BUILD_DIR .. "win64_" .. _ACTION .. "/bin")
 	objdir (BGFX_BUILD_DIR .. "win64_" .. _ACTION .. "/obj")
-	libdirs { BGFX_THIRD_PARTY_DIR .. "lib/win64_" .. _ACTION }
+	libdirs {
+		BGFX_THIRD_PARTY_DIR .. "lib/win64_" .. _ACTION,
+		"$(DXSDK_DIR)/lib/x64",
+	}
 
 configuration { "mingw" }
 	defines { "WIN32" }
@@ -180,13 +186,19 @@ configuration { "mingw" }
 configuration { "x32", "mingw" }
 	targetdir (BGFX_BUILD_DIR .. "win32_mingw" .. "/bin")
 	objdir (BGFX_BUILD_DIR .. "win32_mingw" .. "/obj")
-	libdirs { BGFX_THIRD_PARTY_DIR .. "lib/win32_mingw" }
+	libdirs {
+		BGFX_THIRD_PARTY_DIR .. "lib/win32_mingw",
+		"$(DXSDK_DIR)/lib/x86",
+	}
 	buildoptions { "-m32" }
 
 configuration { "x64", "mingw" }
 	targetdir (BGFX_BUILD_DIR .. "win64_mingw" .. "/bin")
 	objdir (BGFX_BUILD_DIR .. "win64_mingw" .. "/obj")
-	libdirs { BGFX_THIRD_PARTY_DIR .. "lib/win64_mingw" }
+	libdirs {
+		BGFX_THIRD_PARTY_DIR .. "lib/win64_mingw",
+		"$(DXSDK_DIR)/lib/x64",
+	}
 	buildoptions { "-m64" }
 
 configuration { "linux" }

+ 1 - 1
premake/shaderc.lua

@@ -35,7 +35,7 @@ project "shaderc"
 	}
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 
 		FCPP_DIR,
 

+ 1 - 1
premake/texturec.lua

@@ -3,7 +3,7 @@ project "texturec"
 	kind "ConsoleApp"
 
 	includedirs {
-		BGFX_DIR .. "../bx/include",
+		BX_DIR .. "include",
 		BGFX_DIR .. "include",
 		BGFX_DIR .. "src",
 	}