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

BII buildable

Browse Source
This commit is contained in:
kanjitalk755 2018-06-19 13:36:27 +09:00
parent 1cd716ee8e
commit 418d92dafe
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/Windows/Makefile.in
View File

@ -40,7 +40,7 @@ CXXFLAGS = @CXXFLAGS@ $(SDL_CFLAGS)
CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../CrossPlatform @CPUINCLUDES@ -I../slirp CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../CrossPlatform @CPUINCLUDES@ -I../slirp
DEFS = @DEFS@ @DEFINES@ DEFS = @DEFS@ @DEFINES@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ -lwsock32 -liphlpapi LIBS = @LIBS@ -lws2_32 -lwsock32 -liphlpapi
CPUSRCS = @CPUSRCS@ CPUSRCS = @CPUSRCS@
HOST_CC = gcc HOST_CC = gcc

12
BasiliskII/src/Windows/configure.ac
View File

@ -131,7 +131,7 @@ AC_CACHE_CHECK([whether VirtualProtect works],
#define HAVE_WIN32_VM 1 #define HAVE_WIN32_VM 1
#define CONFIGURE_TEST_VM_MAP #define CONFIGURE_TEST_VM_MAP
#define TEST_VM_PROT_$test_def #define TEST_VM_PROT_$test_def
#include "../Unix/vm_alloc.cpp" #include "../CrossPlatform/vm_alloc.cpp"
], ac_cv_VirtualProtect_works=no, rm -f core, ], ac_cv_VirtualProtect_works=no, rm -f core,
dnl When cross-compiling, assume it works dnl When cross-compiling, assume it works
ac_cv_VirtualProtect_works="yes" ac_cv_VirtualProtect_works="yes"
@ -141,7 +141,7 @@ AC_CACHE_CHECK([whether VirtualProtect works],
#define HAVE_WIN32_VM 1 #define HAVE_WIN32_VM 1
#define CONFIGURE_TEST_VM_MAP #define CONFIGURE_TEST_VM_MAP
#define TEST_VM_PROT_RDWR_WRITE #define TEST_VM_PROT_RDWR_WRITE
#include "../Unix/vm_alloc.cpp" #include "../CrossPlatform/vm_alloc.cpp"
], , ac_cv_VirtualProtect_works=no, ], , ac_cv_VirtualProtect_works=no,
dnl When cross-compiling, assume it works dnl When cross-compiling, assume it works
ac_cv_VirtualProtect_works="yes" ac_cv_VirtualProtect_works="yes"
@ -163,8 +163,8 @@ AC_CACHE_CHECK([whether your system supports Windows exceptions],
AC_TRY_RUN([ AC_TRY_RUN([
#define HAVE_WIN32_EXCEPTIONS 1 #define HAVE_WIN32_EXCEPTIONS 1
#define CONFIGURE_TEST_SIGSEGV_RECOVERY #define CONFIGURE_TEST_SIGSEGV_RECOVERY
#include "../Unix/vm_alloc.cpp" #include "../CrossPlatform/vm_alloc.cpp"
#include "../Unix/sigsegv.cpp" #include "../CrossPlatform/sigsegv.cpp"
], ],
ac_cv_have_win32_exceptions=yes, ac_cv_have_win32_exceptions=yes,
ac_cv_have_win32_exceptions=no, ac_cv_have_win32_exceptions=no,
@ -188,8 +188,8 @@ AC_CACHE_CHECK([whether we can skip instruction in SIGSEGV handler],
AC_TRY_RUN([ AC_TRY_RUN([
#define HAVE_SIGSEGV_SKIP_INSTRUCTION 1 #define HAVE_SIGSEGV_SKIP_INSTRUCTION 1
#define CONFIGURE_TEST_SIGSEGV_RECOVERY #define CONFIGURE_TEST_SIGSEGV_RECOVERY
#include "../Unix/vm_alloc.cpp" #include "../CrossPlatform/vm_alloc.cpp"
#include "../Unix/sigsegv.cpp" #include "../CrossPlatform/sigsegv.cpp"
], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no, ], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no,
dnl When cross-compiling, do not assume anything. dnl When cross-compiling, do not assume anything.
ac_cv_have_skip_instruction=no ac_cv_have_skip_instruction=no

6
BasiliskII/src/Windows/sysdeps.h
View File

@ -21,6 +21,10 @@
#ifndef SYSDEPS_H #ifndef SYSDEPS_H
#define SYSDEPS_H #define SYSDEPS_H
#ifdef __MINGW32__
#define _UNICODE
#endif
#if !defined _MSC_VER && !defined __STDC__ #if !defined _MSC_VER && !defined __STDC__
#error "Your compiler is not ANSI. Get a real one." #error "Your compiler is not ANSI. Get a real one."
#endif #endif
@ -318,6 +322,8 @@ static inline uae_u32 do_byteswap_16_g(uae_u32 v)
#ifdef _MSC_VER #ifdef _MSC_VER
#define ATTRIBUTE_PACKED #define ATTRIBUTE_PACKED
#else
#define ATTRIBUTE_PACKED __attribute__((__packed__))
#endif #endif
#endif #endif

3
BasiliskII/src/Windows/util_windows.cpp
View File

@ -271,7 +271,8 @@ bool check_drivers(void)
else { else {
TCHAR str[256]; TCHAR str[256];
_sntprintf(str, lengthof(str), TEXT("The CD-ROM driver file \"%s\" is missing."), path); _sntprintf(str, lengthof(str), TEXT("The CD-ROM driver file \"%s\" is missing."), path);
WarningAlert(str); //WarningAlert(str);
} }
return true; return true;

3
SheepShaver/Makefile
View File

@ -49,8 +49,7 @@ $(SRCARCHIVE): $(SRCS) $(DOCS)
# Links to Basilisk II sources # Links to Basilisk II sources
# #
links: links:
mkdir -p src/CrossPlatform (cd src/Windows; if [ ! -e m4 ]; then ln -s ../../../BasiliskII/src/Unix/m4; fi)
mkdir -p src/Unix/Irix
@list='adb.cpp audio.cpp cdrom.cpp disk.cpp extfs.cpp pict.c \ @list='adb.cpp audio.cpp cdrom.cpp disk.cpp extfs.cpp pict.c \
prefs.cpp scsi.cpp sony.cpp xpram.cpp \ prefs.cpp scsi.cpp sony.cpp xpram.cpp \
include/adb.h include/audio.h include/audio_defs.h \ include/adb.h include/audio.h include/audio_defs.h \