LegacyConsole/GabsPuNs-MinecraftConsoles
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-05-21 23:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Server compilation

Browse Source
This commit is contained in:
GabsPuNs
2026-04-19 03:33:56 -04:00
parent 6b54299695
commit a6facc2668
6 changed files with 11 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Minecraft.Client/CMakeLists.txt
View File

@@ -72,8 +72,6 @@ target_link_libraries(Minecraft.Client
"${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"
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC.lib"
# Release Discord libraries
"${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Discord/libs/discord-rpc.lib"
>

11
Minecraft.Server/CMakeLists.txt
View File

@@ -17,6 +17,7 @@ target_include_directories(Minecraft.Server PRIVATE
"${CMAKE_BINARY_DIR}/generated/" # This is for the generated BuildVer.h
"${CMAKE_SOURCE_DIR}/Minecraft.Client/"
"${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/Iggy/include"
"${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Discord/inc"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/include/"
)
@@ -42,15 +43,21 @@ target_link_libraries(Minecraft.Server PRIVATE
XInput9_1_0
wsock32
legacy_stdio_definitions
$<$<CONFIG:Debug>: # Debug 4J libraries
$<$<CONFIG:Debug>:
# Debug 4J libraries
"${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"
# Debug Discord libraries
"${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Discord/libs/discord-rpc_d.lib"
>
$<$<NOT:$<CONFIG:Debug>>: # Release 4J libraries
$<$<NOT:$<CONFIG:Debug>>:
# Release 4J libraries
"${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"
# Release Discord libraries
"${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Discord/libs/discord-rpc.lib"
>
)

2
Minecraft.Server/WorldManager.h
View File

@@ -86,7 +86,7 @@ namespace ServerRuntime
*/
bool WaitForWorldActionIdle(
int actionPad,
DWORD timeoutMs,
DWORD64 timeoutMs,
WorldManagerTickProc tickProc,
WorldManagerHandleActionsProc handleActionsProc);
}

2
Minecraft.Server/cmake/sources/Common.cmake
View File

@@ -477,6 +477,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Windows64/PostProcesser.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Windows64/Windows64_App.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Windows64/Windows64_DiscordPresence.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Windows64/Windows64_Minecraft.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Windows64/Windows64_UIController.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/WitchModel.cpp"
@@ -498,7 +499,6 @@ set(_MINECRAFT_SERVER_COMMON_ROOT
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/stubs.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.World/ConsoleSaveFileOriginal.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.World/ConsoleSaveFileOriginal.h"
"${CMAKE_CURRENT_SOURCE_DIR}/../include/lce_filesystem/lce_filesystem.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Console/ServerCliInput.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Console/ServerCliInput.h"
)

68
include/lce_filesystem/lce_filesystem.cpp
View File

@@ -1,68 +0,0 @@
#include "stdafx.h"
#include "lce_filesystem.h"
bool FileOrDirectoryExists(const char* path)
{
#ifdef _WINDOWS64
DWORD attribs = GetFileAttributesA(path);
return (attribs != INVALID_FILE_ATTRIBUTES);
#else
#error "FileOrDirectoryExists not implemented for this platform"
return false;
#endif
}
bool FileExists(const char* path)
{
#ifdef _WINDOWS64
DWORD attribs = GetFileAttributesA(path);
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
#else
#error "FileExists not implemented for this platform"
return false;
#endif
}
bool DirectoryExists(const char* path)
{
#ifdef _WINDOWS64
DWORD attribs = GetFileAttributesA(path);
return (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY));
#else
#error "DirectoryExists not implemented for this platform"
return false;
#endif
}
bool GetFirstFileInDirectory(const char* directory, char* outFilePath, size_t outFilePathSize)
{
#ifdef _WINDOWS64
char searchPath[MAX_PATH];
snprintf(searchPath, MAX_PATH, "%s\\*", directory);
WIN32_FIND_DATAA findData;
HANDLE hFind = FindFirstFileA(searchPath, &findData);
if (hFind == INVALID_HANDLE_VALUE)
{
return false;
}
do
{
if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
// Found a file, copy its path to the output buffer
snprintf(outFilePath, outFilePathSize, "%s\\%s", directory, findData.cFileName);
FindClose(hFind);
return true;
}
} while (FindNextFileA(hFind, &findData) != 0);
FindClose(hFind);
return false; // No files found in the directory
#else
#error "GetFirstFileInDirectory not implemented for this platform"
return false;
#endif
}

6
include/lce_filesystem/lce_filesystem.h
View File

@@ -1,6 +0,0 @@
#pragma once
bool FileOrDirectoryExists(const char* path);
bool FileExists(const char* path);
bool DirectoryExists(const char* path);
bool GetFirstFileInDirectory(const char* directory, char* outFilePath, size_t outFilePathSize);