From 4ee0e9e5e92a0cf60ff5f43476626021d85ea186 Mon Sep 17 00:00:00 2001 From: Lord_Cambion Date: Wed, 1 Apr 2026 22:20:13 +0200 Subject: [PATCH] Carica file su "Minecraft.Client" --- Minecraft.Client/CMakeLists.txt | 107 +++++++++++++++----------------- 1 file changed, 51 insertions(+), 56 deletions(-) diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index 29d136e0..194d09fd 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -5,97 +5,92 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/PS3.cmake") include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/PSVita.cmake") include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Windows.cmake") include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Xbox360.cmake") + include("${CMAKE_SOURCE_DIR}/cmake/CommonSources.cmake") + include("${CMAKE_SOURCE_DIR}/cmake/Utils.cmake") # Combine all source files into a single variable for the target +# We cant use CMAKE_CONFIGURE_PRESET here as VS doesn't set it, so just rely on the folder set(MINECRAFT_CLIENT_SOURCES - ${MINECRAFT_CLIENT_COMMON} - $<$:${MINECRAFT_CLIENT_DURANGO}> - $<$:${MINECRAFT_CLIENT_ORBIS}> - $<$:${MINECRAFT_CLIENT_PS3}> - $<$:${MINECRAFT_CLIENT_PSVITA}> - $<$:${MINECRAFT_CLIENT_WINDOWS}> - $<$:${MINECRAFT_CLIENT_XBOX360}> - ${SOURCES_COMMON} - # Stub for server-only symbols (LogInfof/LogWarnf/LogErrorf, RequestDedicatedServerShutdown) - # that are excluded from Minecraft.Server.Lib - "ServerCliStubs.cpp" + ${MINECRAFT_CLIENT_COMMON} + $<$:${MINECRAFT_CLIENT_DURANGO}> + $<$:${MINECRAFT_CLIENT_ORBIS}> + $<$:${MINECRAFT_CLIENT_PS3}> + $<$:${MINECRAFT_CLIENT_PSVITA}> + $<$:${MINECRAFT_CLIENT_WINDOWS}> + $<$:${MINECRAFT_CLIENT_XBOX360}> + ${SOURCES_COMMON} ) -add_executable(Minecraft.Client ${MINECRAFT_CLIENT_SOURCES} -#"ServerCliStubs.cpp" -) +add_executable(Minecraft.Client ${MINECRAFT_CLIENT_SOURCES} "PhantomModel.h" "PhantomModel.cpp" "PhantomRenderer.h" "PhantomRenderer.cpp") # Only define executable on windows if(PLATFORM_NAME STREQUAL "Windows64") - set_target_properties(Minecraft.Client PROPERTIES WIN32_EXECUTABLE TRUE) + set_target_properties(Minecraft.Client PROPERTIES WIN32_EXECUTABLE TRUE) endif() target_include_directories(Minecraft.Client PRIVATE - "${CMAKE_BINARY_DIR}/generated/" - "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/include" - "${CMAKE_SOURCE_DIR}/include/" - "${CMAKE_SOURCE_DIR}/Minecraft.Server" + "${CMAKE_BINARY_DIR}/generated/" # This is for the generated BuildVer.h + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/include" + "${CMAKE_SOURCE_DIR}/include/" ) - target_compile_definitions(Minecraft.Client PRIVATE - ${MINECRAFT_SHARED_DEFINES} + ${MINECRAFT_SHARED_DEFINES} ) - target_precompile_headers(Minecraft.Client PRIVATE "$<$:stdafx.h>") -set_source_files_properties(compat_shims.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) -set_source_files_properties(ServerCliStubs.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) +set_source_files_properties(compat_shims.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) # This redefines internal MSVC CRT symbols which will cause an issue with PCH configure_compiler_target(Minecraft.Client) set_target_properties(Minecraft.Client PROPERTIES - OUTPUT_NAME "Minecraft.Client" - VS_DEBUGGER_WORKING_DIRECTORY "$" + OUTPUT_NAME "Minecraft.Client" + VS_DEBUGGER_WORKING_DIRECTORY "$" ) target_link_libraries(Minecraft.Client PRIVATE - Minecraft.World - # Server logic shared with client (CLI commands: give, gamemode, etc.) - $<$:Minecraft.Server.Lib> - d3d11 - d3dcompiler - 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" - > + Minecraft.World + d3d11 + d3dcompiler + XInput9_1_0 + wsock32 + legacy_stdio_definitions + $<$: # Debug 4J libraries + "${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" + > + $<$>: # Release 4J libraries + "${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" + > ) +# Iggy libs foreach(lib IN LISTS IGGY_LIBS) - target_link_libraries(Minecraft.Client PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/lib/${lib}") + target_link_libraries(Minecraft.Client PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/lib/${lib}") endforeach() -# --------------------------------------------------------------------------- +# --- # Asset / redist copy -# --------------------------------------------------------------------------- +# --- include("${CMAKE_SOURCE_DIR}/cmake/CopyAssets.cmake") set(ASSET_FOLDER_PAIRS - "${CMAKE_CURRENT_SOURCE_DIR}/music" "music" - "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media" "Common/Media" - "${CMAKE_CURRENT_SOURCE_DIR}/Common/res" "Common/res" - "${CMAKE_CURRENT_SOURCE_DIR}/Common/Trial" "Common/Trial" - "${CMAKE_CURRENT_SOURCE_DIR}/Common/Tutorial" "Common/Tutorial" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media" "${PLATFORM_NAME}Media" + "${CMAKE_CURRENT_SOURCE_DIR}/music" "music" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media" "Common/Media" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/res" "Common/res" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/Trial" "Common/Trial" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/Tutorial" "Common/Tutorial" + "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media" "${PLATFORM_NAME}Media" ) setup_asset_folder_copy(Minecraft.Client "${ASSET_FOLDER_PAIRS}") +# Copy redist files add_copyredist_target(Minecraft.Client) +# Make sure GameHDD exists on Windows if(PLATFORM_NAME STREQUAL "Windows64") - add_gamehdd_target(Minecraft.Client) -endif() \ No newline at end of file + add_gamehdd_target(Minecraft.Client) +endif()