From 626e124d6d2fb8bc31e594fc0a18b41a62c5dc5b Mon Sep 17 00:00:00 2001 From: Patoke Date: Tue, 21 Apr 2026 02:59:24 -0400 Subject: [PATCH] feat: 4JLibs as a submodule --- Minecraft.Client/CMakeLists.txt | 14 ++++---------- cmake/ServerTarget.cmake | 14 ++++---------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index ebf9e9e9..f872fb87 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -89,16 +89,10 @@ if(MINECRAFT_CLIENT_USE_4J_DEBUG_LIBS) XInput9_1_0 wsock32 legacy_stdio_definitions - $<$: - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Input_d.lib" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Storage_d.lib" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC_d.lib" - > - $<$>: - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Input.lib" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Storage.lib" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC.lib" - > + 4JLibs.${PLATFORM_NAME}.Input + 4JLibs.${PLATFORM_NAME}.Profile + 4JLibs.${PLATFORM_NAME}.Storage + 4JLibs.${PLATFORM_NAME}.Render ) else() target_link_libraries(Minecraft.Client PRIVATE diff --git a/cmake/ServerTarget.cmake b/cmake/ServerTarget.cmake index 2524d6ba..cadf0903 100644 --- a/cmake/ServerTarget.cmake +++ b/cmake/ServerTarget.cmake @@ -84,16 +84,10 @@ function(configure_lce_server_target target) XInput9_1_0 wsock32 legacy_stdio_definitions - $<$: - "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Input_d.lib" - "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Storage_d.lib" - "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC_d.lib" - > - $<$>: - "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Input.lib" - "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Storage.lib" - "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC.lib" - > + 4JLibs.${PLATFORM_NAME}.Input + 4JLibs.${PLATFORM_NAME}.Profile + 4JLibs.${PLATFORM_NAME}.Storage + 4JLibs.${PLATFORM_NAME}.Render ) else() target_link_libraries(${target} PRIVATE