Skip to content

Commit ef04779

Browse files
committed
Remove VClib and use bgfx fative
1 parent 28d34c5 commit ef04779

34 files changed

Lines changed: 531 additions & 260 deletions

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
[submodule "libs/vclib"]
3-
path = libs/vclib
4-
url = https://github.com/cnr-isti-vclab/vclib.git
2+
[submodule "libs/bgfx.cmake"]
3+
path = libs/bgfx.cmake
4+
url = https://github.com/bkaradzic/bgfx.cmake.git

‎CMakeLists.txt‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,29 @@
11
cmake_minimum_required(VERSION 3.11)
22

3-
if(${CMAKE_VERSION} VERSION_LESS 3.29)
4-
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
5-
else()
6-
cmake_policy(VERSION 3.29)
7-
endif()
8-
93
set(CMAKE_CXX_STANDARD 20)
104
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
115

126
project(bgfx-lines)
13-
14-
set(VCLIB_BUILD_MODULE_RENDER ON)
15-
set(VCLIB_BUILD_EXAMPLES OFF)
16-
set(VCLIB_BUILD_TESTS OFF)
17-
set(VCLIB_ALLOW_SYSTEM_QT OFF)
18-
add_subdirectory(${PROJECT_SOURCE_DIR}/libs/vclib)
7+
include(${PROJECT_SOURCE_DIR}/cmake/bgfx_utils.cmake)
8+
add_subdirectory(${PROJECT_SOURCE_DIR}/libs/bgfx.cmake)
199

2010

2111
set(SRC_DIR "${CMAKE_SOURCE_DIR}/src")
2212
set(INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")
13+
set(SHADERS_DIR "${CMAKE_SOURCE_DIR}/shaders")
2314

2415
file(GLOB_RECURSE SOURCES_FILES "${SRC_DIR}/*.cpp")
25-
26-
set(SHADERS_DIR "${CMAKE_SOURCE_DIR}/shaders")
2716
file(GLOB_RECURSE ABSOLUTE_SHADERS_FILES "${SHADERS_DIR}/*.sc" "${SHADERS_DIR}/*.sh")
28-
set(RELATIVE_SHADERS_FILES "")
2917

18+
set(RELATIVE_SHADERS_FILES "")
3019
foreach(file ${ABSOLUTE_SHADERS_FILES})
3120
file(RELATIVE_PATH relative_file ${CMAKE_SOURCE_DIR} ${file})
3221
list(APPEND RELATIVE_SHADERS_FILES ${relative_file})
3322
endforeach()
3423

3524
add_library(bgfx-lines ${SOURCES_FILES})
3625
target_include_directories(bgfx-lines PUBLIC include)
37-
target_link_libraries(bgfx-lines PUBLIC vclib)
26+
target_link_libraries(bgfx-lines PUBLIC bgfx)
3827
target_add_bgfx_shaders(
3928
bgfx-lines
4029
${RELATIVE_SHADERS_FILES}
@@ -47,7 +36,7 @@ foreach(EXAMPLE_DIR ${EXAMPLE_DIRS})
4736
if (EXISTS "${EXAMPLE_MAIN}")
4837
add_executable(${EXAMPLE_DIR} "${EXAMPLE_MAIN}")
4938
target_include_directories(${EXAMPLE_DIR} PUBLIC ${EXAMPLES_DIR}/${EXAMPLE_DIR})
50-
target_link_libraries(${EXAMPLE_DIR} PUBLIC bgfx-lines)
39+
target_link_libraries(${EXAMPLE_DIR} PUBLIC bgfx-lines example-common)
5140
endif()
5241
endforeach()
5342

0 commit comments

Comments
 (0)