Li/minecraft-pe-0.6.1
1
0
Fork 0
forked from Kolyah35/minecraft-pe-0.6.1
Code Pull Requests Activity

Haiku port

Browse Source
This commit is contained in:
Li
2026-04-19 22:38:38 +00:00
parent bc82f5c091
commit 1effcd1e6d
8 changed files with 167 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
CMakeLists.txt
View File

@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 3.21) cmake_minimum_required(VERSION 3.21)
project(MinecraftPE) project(MinecraftPE)
if(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
set(HAIKU, 1)
endif()
include(cmake/CPM.cmake) include(cmake/CPM.cmake)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
@@ -26,6 +30,10 @@ if (${PLATFORM} STREQUAL "Desktop")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
endif() endif()
if(HAIKU)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc -static")
endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
endif() endif()
@@ -34,6 +42,10 @@ if (${PLATFORM} STREQUAL "Desktop")
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
include_directories(misc/windows) include_directories(misc/windows)
set(EXTRA_LIBS ws2_32 winhttp) set(EXTRA_LIBS ws2_32 winhttp)
elseif(HAIKU)
find_library(pthread NAMES pthread)
find_library(network NAMES network)
set(EXTRA_LIBS pthread m network)
elseif(UNIX) elseif(UNIX)
find_library(pthread NAMES pthread) find_library(pthread NAMES pthread)
set(EXTRA_LIBS pthread m) set(EXTRA_LIBS pthread m)
@@ -44,73 +56,88 @@ elseif (${PLATFORM} STREQUAL "Web")
set(EXTRA_LIBS "idbfs.js") set(EXTRA_LIBS "idbfs.js")
endif() endif()
# I totally shocked if(!HAIKU)
if(${PLATFORM} MATCHES "Web") if(${PLATFORM} MATCHES "Web")
set(PNG_LIB png) set(PNG_LIB png)
set(AL_LIBTYPE "STATIC") set(ZLIB_LIB zlib)
set(AL_LIBTYPE "STATIC")
add_library(zlib INTERFACE IMPORTED) add_library(zlib INTERFACE IMPORTED)
set_target_properties(zlib PROPERTIES set_target_properties(zlib PROPERTIES
INTERFACE_LINK_OPTIONS "-sUSE_ZLIB=1" INTERFACE_LINK_OPTIONS "-sUSE_ZLIB=1"
) )
add_library(png INTERFACE IMPORTED) add_library(png INTERFACE IMPORTED)
set_target_properties(png PROPERTIES set_target_properties(png PROPERTIES
INTERFACE_COMPILE_OPTIONS "-sUSE_LIBPNG=1" INTERFACE_COMPILE_OPTIONS "-sUSE_LIBPNG=1"
INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1" INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1"
) )
add_library(glfw INTERFACE IMPORTED) add_library(glfw INTERFACE IMPORTED)
set_target_properties(glfw PROPERTIES set_target_properties(glfw PROPERTIES
INTERFACE_LINK_OPTIONS "-sUSE_GLFW=3" INTERFACE_LINK_OPTIONS "-sUSE_GLFW=3"
)
else()
set(PNG_LIB png_shared)
set(ZLIB_LIB zlib)
set(AL_LIB "OpenAL::OpenAL")
set(AL_LIBTYPE "SHARED")
CPMAddPackage(
NAME "zlib"
GIT_REPOSITORY "https://github.com/madler/zlib"
GIT_TAG "v1.3.2"
)
CPMAddPackage(
NAME "libpng"
GIT_REPOSITORY "https://github.com/pnggroup/libpng.git"
GIT_TAG "v1.6.55"
OPTIONS
"ZLIB_ROOT ${zlib_SOURCE_DIR}"
"ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
"PNG_TOOLS OFF"
"PNG_TESTS OFF"
)
CPMAddPackage(
NAME "glfw"
GIT_REPOSITORY "https://github.com/glfw/glfw.git"
GIT_TAG "3.4"
EXCLUDE_FROM_ALL TRUE
OPTIONS
"GLFW_BUILD_EXAMPLES OFF"
"GLFW_BUILD_TESTS OFF"
"GLFW_BUILD_DOCS OFF"
)
endif()
CPMAddPackage(
NAME "openal"
GIT_REPOSITORY "https://github.com/kcat/openal-soft.git"
GIT_TAG "1.25.1"
OPTIONS
"ALSOFT_EXAMPLES OFF"
"ALSOFT_TESTS OFF"
"ALSOFT_UTILS OFF"
"LIBTYPE ${AL_LIBTYPE}"
"ALSOFT_ENABLE_MODULES OFF"
"ALSOFT_STATIC_STDCXX ON"
"ALSOFT_STATIC_LIBGCC ON"
) )
else() else()
set(PNG_LIB png_shared) # alot of these have haikuports specific versions,
set(AL_LIBTYPE "SHARED") find_library(glfw NAMES glfw)
find_library(openal NAMES openal)
find_library(png NAMES png)
find_library(zlib NAMES zlib)
CPMAddPackage( set(PNG_LIB png)
NAME "zlib" set(ZLIB_LIB z)
GIT_REPOSITORY "https://github.com/madler/zlib" set(AL_LIB openal)
GIT_TAG "v1.3.2"
)
CPMAddPackage(
NAME "libpng"
GIT_REPOSITORY "https://github.com/pnggroup/libpng.git"
GIT_TAG "v1.6.55"
OPTIONS
"ZLIB_ROOT ${zlib_SOURCE_DIR}"
"ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
"PNG_TOOLS OFF"
"PNG_TESTS OFF"
)
CPMAddPackage(
NAME "glfw"
GIT_REPOSITORY "https://github.com/glfw/glfw.git"
GIT_TAG "3.4"
EXCLUDE_FROM_ALL TRUE
OPTIONS
"GLFW_BUILD_EXAMPLES OFF"
"GLFW_BUILD_TESTS OFF"
"GLFW_BUILD_DOCS OFF"
)
endif() endif()
CPMAddPackage(
NAME "openal"
GIT_REPOSITORY "https://github.com/kcat/openal-soft.git"
GIT_TAG "1.25.1"
OPTIONS
"ALSOFT_EXAMPLES OFF"
"ALSOFT_TESTS OFF"
"ALSOFT_UTILS OFF"
"LIBTYPE ${AL_LIBTYPE}"
"ALSOFT_ENABLE_MODULES OFF"
"ALSOFT_STATIC_STDCXX ON"
"ALSOFT_STATIC_LIBGCC ON"
)
# TODO: Clear this paths with * # TODO: Clear this paths with *
file(GLOB SERVER_SOURCES file(GLOB SERVER_SOURCES
"project/lib_projects/raknet/jni/RaknetSources/*.cpp" "project/lib_projects/raknet/jni/RaknetSources/*.cpp"
@@ -316,7 +343,8 @@ if(UNIX)
"project/lib_projects/raknet/jni/RaknetSources" "project/lib_projects/raknet/jni/RaknetSources"
) )
target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries("${PROJECT_NAME}-server" ${EXTRA_LIBS})
endif() endif()
add_executable(${PROJECT_NAME} ${CLIENT_SOURCES}) add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
@@ -372,11 +400,16 @@ if(${PLATFORM} MATCHES "Web")
endif() endif()
target_compile_definitions(${PROJECT_NAME} PUBLIC "__EMSCRIPTEN__" "NO_SOUND" "NO_NETWORK") target_compile_definitions(${PROJECT_NAME} PUBLIC "__EMSCRIPTEN__" "NO_SOUND" "NO_NETWORK")
else()
target_compile_options(${PROJECT_NAME} PUBLIC
"-O3"
)
endif() endif()
# Client # Client
target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM}) target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})
target_link_libraries(${PROJECT_NAME} ${ZLIB_LIB} ${PNG_LIB} ${AL_LIB} glfw ${EXTRA_LIBS})
if (OpenSSL_FOUND) if (OpenSSL_FOUND)
target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto) target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)
@@ -407,4 +440,4 @@ else()
endif() endif()
message(STATUS "Compiling with the flags:") message(STATUS "Compiling with the flags:")
message(STATUS " PLATFORM=" ${PLATFORM_CPP}) message(STATUS " PLATFORM=" ${PLATFORM_CPP})

27
project/lib_projects/raknet/jni/RaknetSources/SocketLayer.cpp
View File

@@ -42,10 +42,10 @@ SocketLayerOverride *SocketLayer::slo=0;
#endif #endif
#if defined(__HAIKU__)
#include <sys/types.h>
#include <ifaddrs.h>
#endif
@@ -1436,8 +1436,25 @@ RakNet::RakString SocketLayer::GetSubNetForSocketAndIp(SOCKET inSock, RakNet::Ra
} }
} }
return ""; return "";
#else #elif defined(__HAIKU__)
struct ifaddrs *ifap, *ifa;
getifaddrs (&ifap);
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr && ifa->ifa_addr->sa_family==AF_INET) {
sockaddr_in* sa = (sockaddr_in*)ifa->ifa_addr;
char* ip_addr = inet_ntoa(sa->sin_addr);
if (inIpString == ip_addr) {
sockaddr_in* sa = (sockaddr_in*)ifa->ifa_netmask;
char* netmask = inet_ntoa(sa->sin_addr);
freeifaddrs(ifap);
return netmask;
}
}
}
freeifaddrs(ifap);
return "";
#else
int fd,fd2; int fd,fd2;
fd2 = socket__(AF_INET, SOCK_DGRAM, 0); fd2 = socket__(AF_INET, SOCK_DGRAM, 0);

4
project/lib_projects/raknet/jni/RaknetSources/UDPForwarder.cpp
View File

@@ -1,5 +1,9 @@
#include "UDPForwarder.h" #include "UDPForwarder.h"
#if defined(__HAIKU__)
#include <sys/select.h>
#endif
#if _RAKNET_SUPPORT_UDPForwarder==1 #if _RAKNET_SUPPORT_UDPForwarder==1
#include "GetTime.h" #include "GetTime.h"

6
src/platform/CThread.cpp
View File

@@ -25,7 +25,7 @@
&m_threadID // pointer to receive thread ID &m_threadID // pointer to receive thread ID
); );
#endif #endif
#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__) #if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__) || defined(__HAIKU__)
mp_threadFunc = (pthread_fn)threadFunc; mp_threadFunc = (pthread_fn)threadFunc;
pthread_attr_init(&m_attributes); pthread_attr_init(&m_attributes);
@@ -53,7 +53,7 @@
#ifdef WIN32 #ifdef WIN32
Sleep( millis ); Sleep( millis );
#endif #endif
#if defined(LINUX) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) #if defined(LINUX) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__HAIKU__)
usleep(millis * 1000); usleep(millis * 1000);
#endif #endif
} }
@@ -63,7 +63,7 @@
#ifdef WIN32 #ifdef WIN32
TerminateThread(m_threadHandle, 0); TerminateThread(m_threadHandle, 0);
#endif #endif
#if defined(LINUX) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) #if defined(LINUX) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__HAIKU__)
// Thread was created detached; pthread_join on a detached thread is undefined // Thread was created detached; pthread_join on a detached thread is undefined
// and causes SIGABRT when the pthread_t is no longer valid. // and causes SIGABRT when the pthread_t is no longer valid.
pthread_attr_destroy(&m_attributes); pthread_attr_destroy(&m_attributes);

4
src/platform/CThread.h
View File

@@ -13,7 +13,7 @@
typedef void *( * pthread_fn )( void * ); typedef void *( * pthread_fn )( void * );
#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__) #if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__) || defined(__HAIKU__)
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>
@@ -38,7 +38,7 @@ typedef void *( * pthread_fn )( void * );
DWORD m_threadID; DWORD m_threadID;
HANDLE m_threadHandle; HANDLE m_threadHandle;
#endif #endif
#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__) #if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__) || defined(__HAIKU__)
pthread_fn mp_threadFunc; pthread_fn mp_threadFunc;
pthread_t m_thread; pthread_t m_thread;
pthread_attr_t m_attributes; pthread_attr_t m_attributes;

27
src/raknet/SocketLayer.cpp
View File

@@ -42,11 +42,10 @@ SocketLayerOverride *SocketLayer::slo=0;
#endif #endif
#if defined(__HAIKU__)
#include <sys/types.h>
#include <ifaddrs.h>
#endif
@@ -1436,6 +1435,24 @@ RakNet::RakString SocketLayer::GetSubNetForSocketAndIp(SOCKET inSock, RakNet::Ra
} }
} }
return ""; return "";
#elif defined(__HAIKU__)
struct ifaddrs *ifap, *ifa;
getifaddrs (&ifap);
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr && ifa->ifa_addr->sa_family==AF_INET) {
sockaddr_in* sa = (sockaddr_in*)ifa->ifa_addr;
char* ip_addr = inet_ntoa(sa->sin_addr);
if (inIpString == ip_addr) {
sockaddr_in* sa = (sockaddr_in*)ifa->ifa_netmask;
char* netmask = inet_ntoa(sa->sin_addr);
freeifaddrs(ifap);
return netmask;
}
}
}
freeifaddrs(ifap);
return "";
#else #else
int fd,fd2; int fd,fd2;

4
src/raknet/UDPForwarder.cpp
View File

@@ -1,5 +1,9 @@
#include "UDPForwarder.h" #include "UDPForwarder.h"
#if defined(__HAIKU__)
#include <sys/select.h>
#endif
#if _RAKNET_SUPPORT_UDPForwarder==1 #if _RAKNET_SUPPORT_UDPForwarder==1
#include "GetTime.h" #include "GetTime.h"

18
src/world/level/storage/ExternalFileLevelStorageSource.cpp
View File

@@ -9,6 +9,10 @@
#include <cstdio> #include <cstdio>
#include <sys/types.h> #include <sys/types.h>
#if defined(__HAIKU__)
#include <sys/stat.h>
#endif
#ifdef __APPLE__ #ifdef __APPLE__
#include "MoveFolder.h" #include "MoveFolder.h"
#endif #endif
@@ -66,7 +70,7 @@ void ExternalFileLevelStorageSource::addLevelSummaryIfExists(LevelSummaryList& d
void ExternalFileLevelStorageSource::getLevelList(LevelSummaryList& dest) void ExternalFileLevelStorageSource::getLevelList(LevelSummaryList& dest)
{ {
#ifdef WIN32 #if defined(WIN32)
WIN32_FIND_DATAA fileData; WIN32_FIND_DATAA fileData;
HANDLE hFind; HANDLE hFind;
@@ -83,8 +87,6 @@ void ExternalFileLevelStorageSource::getLevelList(LevelSummaryList& dest)
} while (FindNextFileA(hFind, &fileData)); } while (FindNextFileA(hFind, &fileData));
FindClose(hFind); FindClose(hFind);
} }
#else #else
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
@@ -94,10 +96,20 @@ void ExternalFileLevelStorageSource::getLevelList(LevelSummaryList& dest)
} }
while ((dirp = readdir(dp)) != NULL) { while ((dirp = readdir(dp)) != NULL) {
#if defined(__HAIKU__)
struct stat st;
const auto fullPath = basePath + "/" + dirp->d_name;
if (!lstat(fullPath.c_str(), &st)) {
if(st.st_mode & S_IFDIR) {
addLevelSummaryIfExists(dest, dirp->d_name);
}
}
#else
if (dirp->d_type == DT_DIR) if (dirp->d_type == DT_DIR)
{ {
addLevelSummaryIfExists(dest, dirp->d_name); addLevelSummaryIfExists(dest, dirp->d_name);
} }
#endif
} }
closedir(dp); closedir(dp);
#endif #endif