scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bkaradzic/bgfx

Browse source
This commit is contained in:
Branimir Karadžić 2015-05-24 10:25:55 -07:00
commit 25c7b6a3fa
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
examples/runtime/images/SplashScreen.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

2
scripts/bgfx.lua
View file

@ -81,7 +81,7 @@ function bgfxProject(_name, _kind, _defines)
"$(DXSDK_DIR)/include", "$(DXSDK_DIR)/include",
} }
configuration { "winphone8*"} configuration { "winphone8* or winstore8*"}
linkoptions { linkoptions {
"/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 "/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
} }

3
scripts/example-common.lua
View file

@ -48,7 +48,8 @@ project ("example-common")
} }
end end
configuration { "winphone8*"} configuration { "winphone8* or winstore8*"}
linkoptions { linkoptions {
"/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 "/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
} }
premake.vstudio.splashpath = "../../../examples/runtime/images/SplashScreen.png"

25
scripts/genie.lua
View file

@ -88,10 +88,7 @@ function exampleProject(_name)
configuration {} configuration {}
-- don't output debugdir for winphone builds debugdir (path.join(BGFX_DIR, "examples/runtime"))
if "winphone81" ~= _OPTIONS["vs"] then
debugdir (path.join(BGFX_DIR, "examples/runtime"))
end
includedirs { includedirs {
path.join(BX_DIR, "include"), path.join(BX_DIR, "include"),
@ -221,7 +218,7 @@ function exampleProject(_name)
"psapi", "psapi",
} }
configuration { "winphone8*"} configuration { "winphone8* or winstore8*" }
removelinks { removelinks {
"DelayImp", "DelayImp",
"gdi32", "gdi32",
@ -234,7 +231,17 @@ function exampleProject(_name)
linkoptions { linkoptions {
"/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 "/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
-- WinRT targets need their own output directories or build files stomp over each other
configuration { "x32", "winphone8* or winstore8*" }
targetdir (path.join(BGFX_BUILD_DIR, "win32_" .. _ACTION, "bin", _name))
objdir (path.join(BGFX_BUILD_DIR, "win32_" .. _ACTION, "obj", _name))
configuration { "x64", "winphone8* or winstore8*" }
targetdir (path.join(BGFX_BUILD_DIR, "win64_" .. _ACTION, "bin", _name))
objdir (path.join(BGFX_BUILD_DIR, "win64_" .. _ACTION, "obj", _name))
configuration { "ARM", "winphone8* or winstore8*" }
targetdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "bin", _name)) targetdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "bin", _name))
objdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "obj", _name)) objdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "obj", _name))
@ -366,7 +373,11 @@ exampleProject("21-deferred")
exampleProject("22-windows") exampleProject("22-windows")
exampleProject("23-vectordisplay") exampleProject("23-vectordisplay")
exampleProject("24-nbody") exampleProject("24-nbody")
exampleProject("25-c99")
-- C99 source doesn't compile under WinRT settings
if not premake.vstudio.iswinrt() then
exampleProject("25-c99")
end
if _OPTIONS["with-shared-lib"] then if _OPTIONS["with-shared-lib"] then
group "libs" group "libs"