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

This commit is contained in:
bkaradzic 2012-12-08 18:19:15 -08:00
parent 0ebfe75db3
commit e156d965d1
11 changed files with 26 additions and 14 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -154,13 +154,19 @@ configuration { "vs*" }
configuration { "x32", "vs*" } configuration { "x32", "vs*" }
targetdir (BGFX_BUILD_DIR .. "win32_" .. _ACTION .. "/bin") targetdir (BGFX_BUILD_DIR .. "win32_" .. _ACTION .. "/bin")
objdir (BGFX_BUILD_DIR .. "win32_" .. _ACTION .. "/obj") 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*" } configuration { "x64", "vs*" }
defines { "_WIN64" } defines { "_WIN64" }
targetdir (BGFX_BUILD_DIR .. "win64_" .. _ACTION .. "/bin") targetdir (BGFX_BUILD_DIR .. "win64_" .. _ACTION .. "/bin")
objdir (BGFX_BUILD_DIR .. "win64_" .. _ACTION .. "/obj") 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" } configuration { "mingw" }
defines { "WIN32" } defines { "WIN32" }
@ -180,13 +186,19 @@ configuration { "mingw" }
configuration { "x32", "mingw" } configuration { "x32", "mingw" }
targetdir (BGFX_BUILD_DIR .. "win32_mingw" .. "/bin") targetdir (BGFX_BUILD_DIR .. "win32_mingw" .. "/bin")
objdir (BGFX_BUILD_DIR .. "win32_mingw" .. "/obj") 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" } buildoptions { "-m32" }
configuration { "x64", "mingw" } configuration { "x64", "mingw" }
targetdir (BGFX_BUILD_DIR .. "win64_mingw" .. "/bin") targetdir (BGFX_BUILD_DIR .. "win64_mingw" .. "/bin")
objdir (BGFX_BUILD_DIR .. "win64_mingw" .. "/obj") 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" } buildoptions { "-m64" }
configuration { "linux" } configuration { "linux" }

View file

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

View file

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