diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index f872fb87..5e7ac9b7 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -57,11 +57,12 @@ if(PLATFORM_NAME STREQUAL "Windows64") endif() target_include_directories(Minecraft.Client PRIVATE - "${CMAKE_BINARY_DIR}/generated/" # This is for the generated BuildVer.h + "${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/" + "${CMAKE_SOURCE_DIR}/include" ) + target_compile_definitions(Minecraft.Client PRIVATE ${MINECRAFT_SHARED_DEFINES} ) diff --git a/Minecraft.Client/cmake/sources/Windows.cmake b/Minecraft.Client/cmake/sources/Windows.cmake index 4eb76361..4cbc85e1 100644 --- a/Minecraft.Client/cmake/sources/Windows.cmake +++ b/Minecraft.Client/cmake/sources/Windows.cmake @@ -346,17 +346,6 @@ set(_MINECRAFT_CLIENT_WINDOWS_SOURCE_FILES ) source_group("Source Files" FILES ${_MINECRAFT_CLIENT_WINDOWS_SOURCE_FILES}) -set(_MINECRAFT_CLIENT_WINDOWS_PLATFORM_LIBS_DEV_STORAGE - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/src/4J_Storage.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/src/STO_DLC.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/inc/STO_DLC.h" - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/src/STO_Main.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/inc/STO_Main.h" - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/src/STO_SaveGame.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/4JLibs/impls/Windows_Libs/Storage/inc/STO_SaveGame.h" -) -source_group("Windows64/4JLibs/impls/Windows_Libs/Storage/inc" FILES ${_MINECRAFT_CLIENT_WINDOWS_PLATFORM_LIBS_DEV_STORAGE}) - set(_MINECRAFT_CLIENT_WINDOWS_WINDOWS "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/MinecraftWindows.rc" "${CMAKE_CURRENT_SOURCE_DIR}/Xbox/Resource.h"