diff options
author | 2015-02-28 07:52:28 +0100 | |
---|---|---|
committer | 2015-02-28 07:52:28 +0100 | |
commit | abb3442fe62fe2ee81b35b7f98ca371fae468bff (patch) | |
tree | a9ca70ec681fda082e47c294203d25581bbc1643 /3rdparty/bgfx/scripts/genie.lua | |
parent | 2e294961b4e1a26640633a371264dd3438cc7ddb (diff) |
update libs to latest (nw)
Diffstat (limited to '3rdparty/bgfx/scripts/genie.lua')
-rw-r--r-- | 3rdparty/bgfx/scripts/genie.lua | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/3rdparty/bgfx/scripts/genie.lua b/3rdparty/bgfx/scripts/genie.lua index 0f9cf81a2c9..9056714240e 100644 --- a/3rdparty/bgfx/scripts/genie.lua +++ b/3rdparty/bgfx/scripts/genie.lua @@ -45,16 +45,16 @@ solution "bgfx" language "C++" startproject "example-00-helloworld" -BGFX_DIR = (path.getabsolute("..") .. "/") -local BGFX_BUILD_DIR = (BGFX_DIR .. ".build/") -local BGFX_THIRD_PARTY_DIR = (BGFX_DIR .. "3rdparty/") -BX_DIR = (BGFX_DIR .. "../bx/") +BGFX_DIR = path.getabsolute("..") +local BGFX_BUILD_DIR = path.join(BGFX_DIR, ".build") +local BGFX_THIRD_PARTY_DIR = path.join(BGFX_DIR, "3rdparty") +BX_DIR = path.getabsolute(path.join(BGFX_DIR, "../bx")) defines { "BX_CONFIG_ENABLE_MSVC_LEVEL4_WARNINGS=1" } -dofile (BX_DIR .. "scripts/toolchain.lua") +dofile (path.join(BX_DIR, "scripts/toolchain.lua")) if not toolchain(BGFX_BUILD_DIR, BGFX_THIRD_PARTY_DIR) then return -- no action specified end @@ -80,19 +80,19 @@ function exampleProject(_name) -- don't output debugdir for winphone builds if "winphone81" ~= _OPTIONS["vs"] then - debugdir (BGFX_DIR .. "examples/runtime/") + debugdir (path.join(BGFX_DIR, "examples/runtime")) end includedirs { - BX_DIR .. "include", - BGFX_DIR .. "include", - BGFX_DIR .. "3rdparty", - BGFX_DIR .. "examples/common", + path.join(BX_DIR, "include"), + path.join(BGFX_DIR, "include"), + path.join(BGFX_DIR, "3rdparty"), + path.join(BGFX_DIR, "examples/common"), } files { - BGFX_DIR .. "examples/" .. _name .. "/**.cpp", - BGFX_DIR .. "examples/" .. _name .. "/**.h", + path.join(BGFX_DIR, "examples", _name, "**.cpp"), + path.join(BGFX_DIR, "examples", _name, "**.h"), } links { @@ -120,10 +120,10 @@ function exampleProject(_name) } configuration { "x32" } - libdirs { "$(OVR_DIR)/LibOVR/Lib/Win32/" .. _ACTION } + libdirs { path.join("$(OVR_DIR)/LibOVR/Lib/Win32", _ACTION) } configuration { "x64" } - libdirs { "$(OVR_DIR)/LibOVR/Lib/x64/" .. _ACTION } + libdirs { path.join("$(OVR_DIR)/LibOVR/Lib/x64", _ACTION) } configuration { "x32", "Debug" } links { "libovrd" } @@ -177,8 +177,8 @@ function exampleProject(_name) "/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata } -- WinRT targets need their own output directories are build files stomp over each other - targetdir (BGFX_BUILD_DIR .. "arm_" .. _ACTION .. "/bin/" .. _name) - objdir (BGFX_BUILD_DIR .. "arm_" .. _ACTION .. "/obj/" .. _name) + targetdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "bin", _name)) + objdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "obj", _name)) configuration { "mingw-clang" } kind "ConsoleApp" @@ -236,7 +236,7 @@ function exampleProject(_name) configuration { "osx" } files { - BGFX_DIR .. "examples/common/**.mm", + path.join(BGFX_DIR, "examples/common/**.mm"), } links { "Cocoa.framework", @@ -246,7 +246,7 @@ function exampleProject(_name) configuration { "ios*" } kind "ConsoleApp" files { - BGFX_DIR .. "examples/common/**.mm", + path.join(BGFX_DIR, "examples/common/**.mm"), } linkoptions { "-framework CoreFoundation", @@ -259,7 +259,7 @@ function exampleProject(_name) configuration { "xcode4", "ios" } kind "WindowedApp" files { - BGFX_DIR .. "examples/runtime/iOS-Info.plist" + path.join(BGFX_DIR, "examples/runtime/iOS-Info.plist"), } configuration { "qnx*" } |