diff --git a/bgfx b/bgfx index ffeba57..6573fc4 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit ffeba57b8af0d46bcdcd5bd663791e6feb5d33e4 +Subproject commit 6573fc44a863027caaca95f4e1373e2606b0e96a diff --git a/cmake/shared.cmake b/cmake/shared.cmake index 9597597..f2e3e37 100644 --- a/cmake/shared.cmake +++ b/cmake/shared.cmake @@ -21,13 +21,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/shader.cpp.in target_sources( bgfx-shader INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader.cpp ) target_include_directories( bgfx-shader INTERFACE ${BGFX_DIR}/include ) -add_library( bgfx-bounds INTERFACE ) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/bounds.cpp.in - ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp ) -target_sources( bgfx-bounds INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp ) -target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/include ) -target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/examples/common ) - # Frameworks required on OS X if( ${CMAKE_SYSTEM_NAME} MATCHES Darwin ) find_library( COCOA_LIBRARY Cocoa ) diff --git a/cmake/tools/geometryc.cmake b/cmake/tools/geometryc.cmake index 2e8e94f..b352e8e 100644 --- a/cmake/tools/geometryc.cmake +++ b/cmake/tools/geometryc.cmake @@ -15,7 +15,7 @@ include( cmake/3rdparty/meshoptimizer.cmake ) add_executable( geometryc ${BGFX_DIR}/tools/geometryc/geometryc.cpp ) target_compile_definitions( geometryc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" ) set_target_properties( geometryc PROPERTIES FOLDER "bgfx/tools" ) -target_link_libraries( geometryc bx bgfx-bounds bgfx-vertexlayout meshoptimizer ) +target_link_libraries( geometryc bx bgfx-vertexlayout meshoptimizer ) if( BGFX_CUSTOM_TARGETS ) add_dependencies( tools geometryc ) endif()