diff options
Diffstat (limited to '3rdparty/bgfx/scripts')
-rw-r--r-- | 3rdparty/bgfx/scripts/genie.lua | 20 | ||||
-rw-r--r-- | 3rdparty/bgfx/scripts/shader-embeded.mk | 14 | ||||
-rw-r--r-- | 3rdparty/bgfx/scripts/shader.mk | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/scripts/tools.mk | 2 |
4 files changed, 30 insertions, 8 deletions
diff --git a/3rdparty/bgfx/scripts/genie.lua b/3rdparty/bgfx/scripts/genie.lua index 52554366dfb..a0fa5b712d1 100644 --- a/3rdparty/bgfx/scripts/genie.lua +++ b/3rdparty/bgfx/scripts/genie.lua @@ -218,7 +218,7 @@ function exampleProject(_name) configuration {} end - configuration { "vs*" } + configuration { "vs*", "x32 or x64" } linkoptions { "/ignore:4199", -- LNK4199: /DELAYLOAD:*.dll ignored; no imports found from *.dll } @@ -226,7 +226,7 @@ function exampleProject(_name) "DelayImp", } - configuration { "vs201*" } + configuration { "vs201*", "x32 or x64" } linkoptions { -- this is needed only for testing with GLES2/3 on Windows with VS201x "/DELAYLOAD:\"libEGL.dll\"", "/DELAYLOAD:\"libGLESv2.dll\"", @@ -234,13 +234,24 @@ function exampleProject(_name) configuration { "mingw*" } targetextension ".exe" + links { + "gdi32", + "psapi", + } - configuration { "vs20* or mingw*" } + configuration { "vs20*", "x32 or x64" } links { "gdi32", "psapi", } + configuration { "durango" } + links { + "d3d11_x", + "combase", + "kernelx", + } + configuration { "winphone8* or winstore8*" } removelinks { "DelayImp", @@ -318,7 +329,7 @@ function exampleProject(_name) "SDL2", "pthread", } - + configuration { "rpi" } links { "X11", @@ -409,6 +420,7 @@ exampleProject("23-vectordisplay") exampleProject("24-nbody") exampleProject("26-occlusion") exampleProject("27-terrain") +exampleProject("28-wireframe") -- C99 source doesn't compile under WinRT settings if not premake.vstudio.iswinrt() then diff --git a/3rdparty/bgfx/scripts/shader-embeded.mk b/3rdparty/bgfx/scripts/shader-embeded.mk index 59bb3d9d037..d6ccecf61dd 100644 --- a/3rdparty/bgfx/scripts/shader-embeded.mk +++ b/3rdparty/bgfx/scripts/shader-embeded.mk @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -8,14 +8,17 @@ include $(THISDIR)/tools.mk VS_FLAGS+=-i $(THISDIR)../src/ --type vertex FS_FLAGS+=-i $(THISDIR)../src/ --type fragment +CS_FLAGS+=-i $(THISDIR)../src/ --type compute VS_SOURCES=$(wildcard vs_*.sc) FS_SOURCES=$(wildcard fs_*.sc) +CS_SOURCES=$(wildcard cs_*.sc) VS_BIN = $(addsuffix .bin.h, $(basename $(VS_SOURCES))) FS_BIN = $(addsuffix .bin.h, $(basename $(FS_SOURCES))) +CS_BIN = $(addsuffix .bin.h, $(basename $(CS_SOURCES))) -BIN = $(VS_BIN) $(FS_BIN) +BIN = $(VS_BIN) $(FS_BIN) $(CS_BIN) SHADER_TMP = $(TEMP)/tmp @@ -41,6 +44,13 @@ fs_%.bin.h : fs_%.sc -$(SILENT) $(SHADERC) $(FS_FLAGS) --platform ios -p metal -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_mtl -@cat $(SHADER_TMP) >> $(@) +cs_%.bin.h : cs_%.sc + @echo [$(<)] + $(SILENT) $(SHADERC) $(CS_FLAGS) --platform linux -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_glsl + @cat $(SHADER_TMP) > $(@) + -$(SILENT) $(SHADERC) $(CS_FLAGS) --platform windows -p cs_5_0 -O 1 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx11 + -@cat $(SHADER_TMP) >> $(@) + .PHONY: all all: $(BIN) diff --git a/3rdparty/bgfx/scripts/shader.mk b/3rdparty/bgfx/scripts/shader.mk index d7e0e151597..7a479ea8896 100644 --- a/3rdparty/bgfx/scripts/shader.mk +++ b/3rdparty/bgfx/scripts/shader.mk @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # diff --git a/3rdparty/bgfx/scripts/tools.mk b/3rdparty/bgfx/scripts/tools.mk index fec2885b7be..1c810c0d14d 100644 --- a/3rdparty/bgfx/scripts/tools.mk +++ b/3rdparty/bgfx/scripts/tools.mk @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # |