Merge pull request #1 from samaursa/master

Public URLs and build fix for Linux
This commit is contained in:
Joshua Brookover
2017-01-27 20:57:57 -06:00
committed by GitHub
3 changed files with 9 additions and 3 deletions

4
.gitmodules vendored
View File

@@ -1,6 +1,6 @@
[submodule "bgfx"]
path = bgfx
url = git@github.com:bkaradzic/bgfx.git
url = https://github.com/bkaradzic/bgfx.git
[submodule "bx"]
path = bx
url = git@github.com:bkaradzic/bx.git
url = https://github.com/bkaradzic/bx.git

View File

@@ -14,6 +14,9 @@ project( bgfx )
set_property( GLOBAL PROPERTY USE_FOLDERS ON )
if( APPLE )
set( CMAKE_CXX_FLAGS "-ObjC++ --std=c++11" )
elseif(UNIX)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
option( BGFX_BUILD_TOOLS "Build bgfx tools." ON )
@@ -54,7 +57,7 @@ if( BGFX_INSTALL )
# install tools
if( BGFX_BUILD_TOOLS )
install( TARGETS shaderc DESTINATION bin )
install( TARGETS shaderc DESTINATION bin )
install( TARGETS geometryc DESTINATION bin )
endif()
endif()

View File

@@ -14,10 +14,13 @@ include( cmake/3rdparty/fcpp.cmake )
include( cmake/3rdparty/glsl-optimizer.cmake )
include( cmake/3rdparty/glslang.cmake )
find_package(Threads)
add_executable( shaderc ${BGFX_DIR}/tools/shaderc/shaderc.cpp ${BGFX_DIR}/tools/shaderc/shaderc.h ${BGFX_DIR}/tools/shaderc/shaderc_glsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_hlsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_pssl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_spirv.cpp )
target_compile_definitions( shaderc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" )
set_target_properties( shaderc PROPERTIES FOLDER "bgfx/tools" )
target_link_libraries( shaderc bx bgfx-vertexdecl bgfx-shader-spirv fcpp glsl-optimizer glslang )
target_link_libraries( shaderc ${CMAKE_THREAD_LIBS_INIT})
add_dependencies( tools shaderc )
function( add_shader ARG_FILE )