From 3d9dd14fd00d978c49ae591110756a4100f1b307 Mon Sep 17 00:00:00 2001 From: MrLetsplay2003 Date: Sat, 9 Sep 2023 16:43:28 +0200 Subject: [PATCH] Clean up CMakeLists --- CMakeLists.txt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0c8110..638e36b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,17 +69,8 @@ target_include_directories(kekengine PUBLIC "dependencies/bullet3/src") target_include_directories(kekengine PUBLIC "dependencies/freetype/include") target_link_libraries(kekengine PUBLIC microtar_static) - -# Freetype -# find_package(PkgConfig REQUIRED) -# -# pkg_check_modules(FREETYPE REQUIRED freetype2) -# target_link_libraries(kekengine PUBLIC ${FREETYPE_LIBRARIES}) -# target_include_directories(kekengine PUBLIC ${FREETYPE_INCLUDE_DIRS}) - -#pkg_check_modules(BULLET REQUIRED bullet) -#target_link_libraries(kekengine PUBLIC ${BULLET_LIBRARIES}) -#target_include_directories(kekengine PUBLIC ${BULLET_INCLUDE_DIRS}) +target_link_libraries(kekengine PUBLIC Bullet3Collision BulletDynamics BulletCollision LinearMath Bullet3Collision Bullet3Common Bullet3Dynamics Bullet3Geometry BulletInverseDynamics) +target_link_libraries(kekengine PUBLIC freetype) if(UNIX) target_link_libraries(kekengine PUBLIC glfw GLEW GL) @@ -114,14 +105,10 @@ endif() add_library(kekengine_shared SHARED $) target_link_libraries(kekengine_shared PUBLIC kekengine) -target_link_libraries(kekengine_shared PUBLIC Bullet3Collision BulletDynamics BulletCollision LinearMath Bullet3Collision Bullet3Common Bullet3Dynamics Bullet3Geometry BulletInverseDynamics) -target_link_libraries(kekengine_shared PUBLIC freetype) set_target_properties(kekengine_shared PROPERTIES OUTPUT_NAME kekengine) add_library(kekengine_static STATIC $) target_link_libraries(kekengine_static PUBLIC kekengine) -target_link_libraries(kekengine_static PUBLIC BulletSoftBody BulletDynamics BulletCollision LinearMath Bullet3Collision Bullet3Common Bullet3Dynamics Bullet3Geometry BulletInverseDynamics) -target_link_libraries(kekengine_static PUBLIC freetype) set_target_properties(kekengine_static PROPERTIES OUTPUT_NAME kekengine) if(${KEKENGINE_BUILD_KEKGAME})