Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-25 02:29:49 +00:00
Code Issues Projects Releases Wiki Activity

fixed compilation problems under BeOS

Browse Source
This commit is contained in:
cebix 2001-02-09 20:04:15 +00:00
parent c23567ab14
commit 4785ea2b9a
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/BeOS/Makefile
View File

@ -33,7 +33,7 @@ TYPE= APP
MACHINE=$(shell uname -m) MACHINE=$(shell uname -m)
ifeq ($(MACHINE), BePC) ifeq ($(MACHINE), BePC)
CPUSRCS = ../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp \ CPUSRCS = ../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp \
../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp cpufast.s ../uae_cpu/readcpu.cpp ../uae_cpu/fpu_x86.cpp cpustbl.cpp cpudefs.cpp cpufast.s
else else
# CPUSRCS = ../powerrom_cpu/powerrom_cpu.cpp # CPUSRCS = ../powerrom_cpu/powerrom_cpu.cpp
CPUSRCS = ../uae_cpu/basilisk_glue.cpp ../uae_cpu/newcpu.cpp \ CPUSRCS = ../uae_cpu/basilisk_glue.cpp ../uae_cpu/newcpu.cpp \

2
BasiliskII/src/BeOS/clip_beos.cpp
View File

@ -73,7 +73,7 @@ void PutScrap(uint32 type, void *scrap, int32 length)
if (no_clip_conversion) { if (no_clip_conversion) {
// Only convert CR->LF // Only convert CR->LF
char *buf = new char[dest_length]; char *buf = new char[length];
for (int i=0; i<length; i++) { for (int i=0; i<length; i++) {
if (i[(char *)scrap] == 13) if (i[(char *)scrap] == 13)
buf[i] = 10; buf[i] = 10;

4
BasiliskII/src/BeOS/extfs_beos.cpp
View File

@ -159,11 +159,11 @@ void get_finfo(const char *path, uint32 finfo, uint32 fxinfo)
if (actual > 0) { if (actual > 0) {
// Translate MIME type to MacOS type/creator // Translate MIME type to MacOS type/creator
char mactype[4]; uint8 mactype[4];
if (sscanf(mime, "application/x-MacOS-%c%c%c%c", mactype, mactype+1, mactype+2, mactype+3) == 4) { if (sscanf(mime, "application/x-MacOS-%c%c%c%c", mactype, mactype+1, mactype+2, mactype+3) == 4) {
// MacOS style type // MacOS style type
WriteMacInt32(finfo + fdType, mactype); WriteMacInt32(finfo + fdType, (mactype[0] << 24) | (mactype[1] << 16) | (mactype[2] << 8) | mactype[3]);
} else { } else {

4
BasiliskII/src/BeOS/sysdeps.h
View File

@ -91,6 +91,8 @@ static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {__asm__ ("rolw $8,%0"
#endif #endif
#define X86_ASSEMBLY #define X86_ASSEMBLY
#define UNALIGNED_PROFITABLE
#define OPTIMIZED_FLAGS
#define ASM_SYM_FOR_FUNC(a) __asm__(a) #define ASM_SYM_FOR_FUNC(a) __asm__(a)
#define REGPARAM __attribute__((regparm(3))) #define REGPARAM __attribute__((regparm(3)))
@ -103,6 +105,8 @@ static inline void do_put_mem_long(uae_u32 *a, uae_u32 v) {*a = v;}
static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {*a = v;} static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {*a = v;}
#undef X86_ASSEMBLY #undef X86_ASSEMBLY
#define UNALIGNED_PROFITABLE
#undef OPTIMIZED_FLAGS
#define ASM_SYM_FOR_FUNC(a) #define ASM_SYM_FOR_FUNC(a)
#define REGPARAM #define REGPARAM
#endif #endif

1
BasiliskII/src/uae_cpu/fpu_x86.cpp
View File

@ -129,6 +129,7 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "sysdeps.h" #include "sysdeps.h"
#include "memory.h" #include "memory.h"