AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Now launcher window shows on haiku os

Browse Source 
although I cheated and used SDL to do it
This commit is contained in:
UnknownShadow200 2019-11-12 07:51:40 +11:00
parent 52ef223d98
commit be3c56d91a
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Logger.c
View File

@ -584,6 +584,19 @@ static void Logger_PrintRegisters(String* str, void* ctx) {
#error "Unknown CPU architecture" #error "Unknown CPU architecture"
#endif #endif
} }
#elif defined CC_BUILD_HAIKU
static void Logger_PrintRegisters(String* str, void* ctx) {
mcontext_t r = ((ucontext_t*)ctx)->uc_mcontext;
#if defined __i386__
#define REG_GET(reg, ign) &r.me##reg
Logger_Dump_X86()
#elif defined __x86_64__
#define REG_GET(reg, ign) &r.r##reg
Logger_Dump_X64()
#else
#error "Unknown CPU architecture"
#endif
}
#endif #endif
static void Logger_DumpRegisters(void* ctx) { static void Logger_DumpRegisters(void* ctx) {
String str; char strBuffer[768]; String str; char strBuffer[768];

2
src/Makefile
View File

@ -65,7 +65,7 @@ endif
ifeq ($(PLAT),haiku) ifeq ($(PLAT),haiku)
CFLAGS=-w -g -pipe CFLAGS=-w -g -pipe
LDFLAGS=-g LDFLAGS=-g
LIBS=-lcurl -lm -lexecinfo -lopenal -lGL LIBS=-lcurl -lm -lexecinfo -lopenal -lGL -lnetwork
endif endif
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)

10
src/Platform.c
View File

@ -91,6 +91,8 @@ const cc_result ReturnCode_SocketWouldBlock = EWOULDBLOCK;
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#elif defined CC_BUILD_HAIKU #elif defined CC_BUILD_HAIKU
#define CC_BUILD_HAIKU
/* TODO: Use open instead of xdg-open */
#include <kernel/image.h> #include <kernel/image.h>
#elif defined CC_BUILD_WEB #elif defined CC_BUILD_WEB
#include <emscripten.h> #include <emscripten.h>
@ -874,6 +876,10 @@ void Platform_LoadSysFonts(void) {
String_FromConst("/usr/pkg/lib/X11/fonts"), String_FromConst("/usr/pkg/lib/X11/fonts"),
String_FromConst("/usr/pkg/share/fonts") String_FromConst("/usr/pkg/share/fonts")
}; };
#elif defined CC_BUILD_HAIKU
static const String dirs[1] = {
String_FromConst("/system/data/fonts")
};
#elif defined CC_BUILD_UNIX #elif defined CC_BUILD_UNIX
static const String dirs[2] = { static const String dirs[2] = {
String_FromConst("/usr/share/fonts"), String_FromConst("/usr/share/fonts"),
@ -884,10 +890,6 @@ void Platform_LoadSysFonts(void) {
String_FromConst("/System/Library/Fonts"), String_FromConst("/System/Library/Fonts"),
String_FromConst("/Library/Fonts") String_FromConst("/Library/Fonts")
}; };
#elif defined CC_BUILD_HAIKU
static const String dirs[1] = {
String_FromConst("/system/data/fonts")
};
#endif #endif
for (i = 0; i < Array_Elems(dirs); i++) { for (i = 0; i < Array_Elems(dirs); i++) {
Directory_Enum(&dirs[i], NULL, FontDirCallback); Directory_Enum(&dirs[i], NULL, FontDirCallback);