58 lines
1.5 KiB
Plaintext
58 lines
1.5 KiB
Plaintext
From 8ecbf89a347696b0efd505062d758538c5e25a27 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sat, 16 May 2020 10:46:58 +0200
|
|
Subject: Haiku support.
|
|
|
|
|
|
diff --git a/Makefile.BeOS b/Makefile.BeOS
|
|
index ee4c5c1..8bd5b02 100644
|
|
--- a/Makefile.BeOS
|
|
+++ b/Makefile.BeOS
|
|
@@ -110,7 +110,7 @@ COMPILER_FLAGS =
|
|
LINKER_FLAGS =
|
|
|
|
## include the makefile-engine
|
|
-include /boot/develop/etc/makefile-engine
|
|
+include /system/develop/etc/makefile-engine
|
|
|
|
# Create links to Frodo sources
|
|
src/main.cpp: src/cpu_macros.h src/cpu_opcodes.h src/prefs.h src/sid.cpp
|
|
diff --git a/src/main.cpp b/src/main.cpp
|
|
index 73f8e15..5fc1a4d 100644
|
|
--- a/src/main.cpp
|
|
+++ b/src/main.cpp
|
|
@@ -23,7 +23,7 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
-#if defined(__BEOS__)
|
|
+#if defined(__BEOS__) || defined(__HAIKU__)
|
|
#include <support/UTF8.h>
|
|
#endif
|
|
|
|
@@ -165,7 +165,7 @@ bool LoadPSIDFile(const char *file)
|
|
|
|
speed_flags = read_psid_32(header, PSID_SPEED);
|
|
|
|
-#if defined(__BEOS__)
|
|
+#if defined(__BEOS__) || defined(__HAIKU__)
|
|
int32 sl = 32, dl = 64, state = 0;
|
|
convert_to_utf8(B_ISO1_CONVERSION, (char *)(header + PSID_NAME), &sl, module_name, &dl, &state);
|
|
sl = 32, dl = 64, state = 0;
|
|
diff --git a/src/types.h b/src/types.h
|
|
index 8df6cc9..4f6e692 100644
|
|
--- a/src/types.h
|
|
+++ b/src/types.h
|
|
@@ -25,7 +25,7 @@
|
|
#include "config.h"
|
|
#endif
|
|
|
|
-#if defined(__BEOS__)
|
|
+#if defined(__BEOS__) || defined(__HAIKU__)
|
|
#include <support/SupportDefs.h>
|
|
#elif defined(SDL)
|
|
#include <SDL_types.h>
|
|
--
|
|
2.26.0
|
|
|