fix: builds on linux and incorrect map colors (#50)
Reviewed-on: https://git.neolegacy.dev/neoStudiosLCE/neoLegacy/pulls/50
This commit is contained in:
+14
-35
@@ -39,11 +39,6 @@ function(configure_lce_server_target target)
|
||||
# "${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/Media/MediaWindows64.arc" "Common/Media/"
|
||||
# )
|
||||
|
||||
set(_use_debug_4j_libs TRUE)
|
||||
if(CMAKE_CROSSCOMPILING AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
set(_use_debug_4j_libs FALSE)
|
||||
endif()
|
||||
|
||||
target_include_directories(${target} PRIVATE
|
||||
"${CMAKE_BINARY_DIR}/generated/" # Generated BuildVer.h
|
||||
"${CMAKE_SOURCE_DIR}/Minecraft.Client/"
|
||||
@@ -75,36 +70,20 @@ function(configure_lce_server_target target)
|
||||
VS_DEBUGGER_COMMAND_ARGUMENTS "-port 25565 -bind 0.0.0.0 -name DedicatedServer"
|
||||
)
|
||||
|
||||
if(_use_debug_4j_libs)
|
||||
target_link_libraries(${target} PRIVATE
|
||||
Minecraft.World
|
||||
d3d11
|
||||
dxgi
|
||||
d3dcompiler
|
||||
XInput9_1_0
|
||||
wsock32
|
||||
dbghelp
|
||||
legacy_stdio_definitions
|
||||
4JLibs.${PLATFORM_NAME}.Input
|
||||
4JLibs.${PLATFORM_NAME}.Profile
|
||||
4JLibs.${PLATFORM_NAME}.Storage
|
||||
4JLibs.${PLATFORM_NAME}.Render
|
||||
)
|
||||
else()
|
||||
target_link_libraries(${target} PRIVATE
|
||||
Minecraft.World
|
||||
d3d11
|
||||
dxgi
|
||||
d3dcompiler
|
||||
XInput9_1_0
|
||||
wsock32
|
||||
dbghelp
|
||||
legacy_stdio_definitions
|
||||
"${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"
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(${target} PRIVATE
|
||||
Minecraft.World
|
||||
d3d11
|
||||
dxgi
|
||||
d3dcompiler
|
||||
XInput9_1_0
|
||||
wsock32
|
||||
dbghelp
|
||||
legacy_stdio_definitions
|
||||
4JLibs.${PLATFORM_NAME}.Input
|
||||
4JLibs.${PLATFORM_NAME}.Profile
|
||||
4JLibs.${PLATFORM_NAME}.Storage
|
||||
4JLibs.${PLATFORM_NAME}.Render
|
||||
)
|
||||
|
||||
foreach(lib IN LISTS IGGY_LIBS)
|
||||
target_link_libraries(${target} PRIVATE "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/Iggy/lib/${lib}")
|
||||
|
||||
Reference in New Issue
Block a user