From f0c63a021cb3803d8ba75a11961c4dad5fcceb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zaj=C4=85c?= Date: Sun, 13 Oct 2024 21:17:55 +0100 Subject: [PATCH] ci: try fix linux glew build error --- CMakeLists.txt | 27 --------------------------- vcpkg-configuration.json | 9 +++++++++ vcpkg.json | 4 ++-- 3 files changed, 11 insertions(+), 29 deletions(-) create mode 100644 vcpkg-configuration.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a0ca02..765339e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,6 @@ set(LEPUS_SRC_DIR ${CMAKE_SOURCE_DIR}/src/lepus) # Engine-wide include directories include_directories(${CMAKE_SOURCE_DIR}/include src ${CMAKE_SOURCE_DIR}/3rdparty) include_directories(${VCPKG_INCLUDE_PATH}) -include_directories(${VCPKG_INCLUDE_PATH}/bullet) link_directories(${VCPKG_LIB_PATH}) @@ -119,32 +118,6 @@ find_package(glfw3 CONFIG REQUIRED) include_directories(LepusGfx ${GLFW_INCLUDES}) # LepusEngine sources -## LepusEngine: PhysX includes -set(PHYSX_INCLUDES ${VCPKG_DEPS_PATH}/include/physx) -include_directories(${PHYSX_INCLUDES}) - -## LepusEngine: Bullet3 libraries - -#find_library(BULLET_COMMON_LIB Bullet3Common ${VCPKG_LIBS_REL_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -set(BULLET_COMMON_LIB ${Bullet3Common}) -#find_library(BULLET_COLLISION_LIB BulletCollision ${VCPKG_LIBS_REL_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -set(BULLET_COLLISION_LIB ${BulletCollision}) -#find_library(BULLET_DYNAMICS_LIB BulletDynamics ${VCPKG_LIBS_REL_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -set(BULLET_DYNAMICS_LIB ${BulletDynamics}) -#find_library(BULLET_LINMATH_LIB LinearMath ${VCPKG_LIBS_REL_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -set(BULLET_LINMATH_LIB ${LinearMath}) - -#find_library(BULLET_COMMON_LIB_DBG Bullet3Common_Debug ${VCPKG_LIBS_DBG_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -#find_library(BULLET_COLLISION_LIB_DBG BulletCollision_Debug ${VCPKG_LIBS_DBG_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -#find_library(BULLET_DYNAMICS_LIB_DBG BulletDynamics_Debug ${VCPKG_LIBS_DBG_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -#find_library(BULLET_LINMATH_LIB_DBG LinearMath_Debug ${VCPKG_LIBS_DBG_PATH} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) - -# Link Bullet for debug and release targets -target_link_libraries(LepusEngine PRIVATE LinearMath Bullet3Common BulletDynamics BulletCollision) - -#target_link_libraries(LepusEngine debug Bullet3Common_Debug optimized Bullet3Common) -#target_link_libraries(LepusEngine debug BulletDynamics_Debug optimized BulletDynamics) -#target_link_libraries(LepusEngine debug BulletCollision_Debug optimized BulletCollision) file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Release) file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Debug) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json new file mode 100644 index 0000000..3253075 --- /dev/null +++ b/vcpkg-configuration.json @@ -0,0 +1,9 @@ + +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json", + "default-registry": { + "kind": "git", + "repository": "https://github.com/tomezpl/vcpkg", + "baseline": "5ead4fccc5d32bc0063983e597eb32aafab3fef4" + } +} \ No newline at end of file diff --git a/vcpkg.json b/vcpkg.json index 49b8772..5155064 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,9 +1,9 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "lepus-engine", "version": "1.0.0", "dependencies": [ "glfw3", "bullet3" - ], - "builtin-baseline": "8dbd66f5a7821ced1ed57696b50375a977006813" + ] } \ No newline at end of file