diff --git a/premake/example-00-helloworld.lua b/premake/example-00-helloworld.lua index e856e374..ac8d30bb 100644 --- a/premake/example-00-helloworld.lua +++ b/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", } diff --git a/premake/example-01-cubes.lua b/premake/example-01-cubes.lua index fda9ba84..e1efeb3e 100644 --- a/premake/example-01-cubes.lua +++ b/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", } diff --git a/premake/example-02-metaballs.lua b/premake/example-02-metaballs.lua index 0fb0963b..26b2a0be 100644 --- a/premake/example-02-metaballs.lua +++ b/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", } diff --git a/premake/example-03-raymarch.lua b/premake/example-03-raymarch.lua index 7107ca90..8138e01f 100644 --- a/premake/example-03-raymarch.lua +++ b/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", } diff --git a/premake/example-04-mesh.lua b/premake/example-04-mesh.lua index abf856ca..488b65ba 100644 --- a/premake/example-04-mesh.lua +++ b/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", } diff --git a/premake/example-05-instancing.lua b/premake/example-05-instancing.lua index ba92b795..de6da9db 100644 --- a/premake/example-05-instancing.lua +++ b/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", } diff --git a/premake/example-06-bump.lua b/premake/example-06-bump.lua index 9d3ded55..fefcd664 100644 --- a/premake/example-06-bump.lua +++ b/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", } diff --git a/premake/makedisttex.lua b/premake/makedisttex.lua index 5255b988..930ee49b 100644 --- a/premake/makedisttex.lua +++ b/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", } diff --git a/premake/premake4.lua b/premake/premake4.lua index 1f252726..c504131c 100644 --- a/premake/premake4.lua +++ b/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" } diff --git a/premake/shaderc.lua b/premake/shaderc.lua index 3f7453db..164969eb 100644 --- a/premake/shaderc.lua +++ b/premake/shaderc.lua @@ -35,7 +35,7 @@ project "shaderc" } includedirs { - BGFX_DIR .. "../bx/include", + BX_DIR .. "include", FCPP_DIR, diff --git a/premake/texturec.lua b/premake/texturec.lua index d655e6f7..da3e2383 100644 --- a/premake/texturec.lua +++ b/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", }