mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-06-08 09:29:31 +00:00
Xcode: modified for building both x86_64 and arm64
This commit is contained in:
parent
20d2de95ce
commit
49eee29597
|
@ -528,6 +528,14 @@ bool Screen_blitter_init(VisualFormat const & visual_format, bool native_byte_or
|
||||||
|
|
||||||
// Windowed 1-bit mode uses a 1-bit X image, so there's no need for special blitting routines
|
// Windowed 1-bit mode uses a 1-bit X image, so there's no need for special blitting routines
|
||||||
Screen_blit = Blit_Copy_Raw;
|
Screen_blit = Blit_Copy_Raw;
|
||||||
|
|
||||||
|
#if !DIRECT_ADDRESSING
|
||||||
|
} else if (mac_depth == 16) {
|
||||||
|
|
||||||
|
Screen_blit = Blit_Copy_Raw;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// Compute RGB shift values
|
// Compute RGB shift values
|
||||||
|
|
|
@ -1090,10 +1090,10 @@
|
||||||
GCC_ENABLE_PASCAL_STRINGS = NO;
|
GCC_ENABLE_PASCAL_STRINGS = NO;
|
||||||
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
|
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
|
||||||
GCC_OPTIMIZATION_LEVEL = 0;
|
GCC_OPTIMIZATION_LEVEL = 0;
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
||||||
|
"GCC_PREPROCESSOR_DEFINITIONS[arch=arm64]" = "$(inherited)";
|
||||||
|
"GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
ENABLE_MACOSX_ETHERHELPER,
|
|
||||||
"BINCUE=1",
|
|
||||||
"USE_JIT=1",
|
"USE_JIT=1",
|
||||||
);
|
);
|
||||||
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
||||||
|
@ -1115,7 +1115,9 @@
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
||||||
ONLY_ACTIVE_ARCH = NO;
|
ONLY_ACTIVE_ARCH = NO;
|
||||||
OTHER_CFLAGS = "";
|
OTHER_CFLAGS = "";
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = "";
|
||||||
|
"OTHER_LDFLAGS[arch=arm64]" = "";
|
||||||
|
"OTHER_LDFLAGS[arch=x86_64]" = (
|
||||||
"-Wl,-no_pie",
|
"-Wl,-no_pie",
|
||||||
"-pagezero_size",
|
"-pagezero_size",
|
||||||
0x1000,
|
0x1000,
|
||||||
|
@ -1124,7 +1126,7 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.basilisk;
|
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.basilisk;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
USE_HEADERMAP = YES;
|
USE_HEADERMAP = YES;
|
||||||
VALID_ARCHS = x86_64;
|
VALID_ARCHS = "x86_64 arm64";
|
||||||
WARNING_CFLAGS = "";
|
WARNING_CFLAGS = "";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
|
@ -1156,10 +1158,10 @@
|
||||||
GCC_ENABLE_PASCAL_STRINGS = NO;
|
GCC_ENABLE_PASCAL_STRINGS = NO;
|
||||||
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
|
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
|
||||||
GCC_OPTIMIZATION_LEVEL = 3;
|
GCC_OPTIMIZATION_LEVEL = 3;
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
||||||
|
"GCC_PREPROCESSOR_DEFINITIONS[arch=arm64]" = "$(inherited)";
|
||||||
|
"GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
ENABLE_MACOSX_ETHERHELPER,
|
|
||||||
"BINCUE=1",
|
|
||||||
"USE_JIT=1",
|
"USE_JIT=1",
|
||||||
);
|
);
|
||||||
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
||||||
|
@ -1180,7 +1182,9 @@
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
||||||
OTHER_CFLAGS = "";
|
OTHER_CFLAGS = "";
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = "";
|
||||||
|
"OTHER_LDFLAGS[arch=arm64]" = "";
|
||||||
|
"OTHER_LDFLAGS[arch=x86_64]" = (
|
||||||
"-Wl,-no_pie",
|
"-Wl,-no_pie",
|
||||||
"-pagezero_size",
|
"-pagezero_size",
|
||||||
0x1000,
|
0x1000,
|
||||||
|
@ -1189,7 +1193,7 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.basilisk;
|
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.basilisk;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
USE_HEADERMAP = YES;
|
USE_HEADERMAP = YES;
|
||||||
VALID_ARCHS = x86_64;
|
VALID_ARCHS = "x86_64 arm64";
|
||||||
WARNING_CFLAGS = "";
|
WARNING_CFLAGS = "";
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
|
|
@ -824,4 +824,7 @@
|
||||||
#define OPTIMIZED_FLAGS
|
#define OPTIMIZED_FLAGS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define ENABLE_MACOSX_ETHERHELPER
|
||||||
|
#define BINCUE 1
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1190,7 +1190,6 @@
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||||
"DATADIR=",
|
"DATADIR=",
|
||||||
HAVE_CONFIG_H,
|
HAVE_CONFIG_H,
|
||||||
USE_JIT,
|
|
||||||
"_GNU_SOURCE=1",
|
"_GNU_SOURCE=1",
|
||||||
_THREAD_SAFE,
|
_THREAD_SAFE,
|
||||||
_REENTRANT,
|
_REENTRANT,
|
||||||
|
@ -1229,7 +1228,6 @@
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||||
"DATADIR=",
|
"DATADIR=",
|
||||||
HAVE_CONFIG_H,
|
HAVE_CONFIG_H,
|
||||||
USE_JIT,
|
|
||||||
"_GNU_SOURCE=1",
|
"_GNU_SOURCE=1",
|
||||||
_THREAD_SAFE,
|
_THREAD_SAFE,
|
||||||
_REENTRANT,
|
_REENTRANT,
|
||||||
|
@ -1299,7 +1297,6 @@
|
||||||
ENABLE_MACOSX_ETHERHELPER,
|
ENABLE_MACOSX_ETHERHELPER,
|
||||||
"DATADIR=",
|
"DATADIR=",
|
||||||
HAVE_CONFIG_H,
|
HAVE_CONFIG_H,
|
||||||
USE_JIT,
|
|
||||||
"_GNU_SOURCE=1",
|
"_GNU_SOURCE=1",
|
||||||
_THREAD_SAFE,
|
_THREAD_SAFE,
|
||||||
_REENTRANT,
|
_REENTRANT,
|
||||||
|
@ -1328,7 +1325,13 @@
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
||||||
OTHER_CFLAGS = "";
|
OTHER_CFLAGS = "";
|
||||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||||
OTHER_LDFLAGS = "-lkpx_cpu";
|
OTHER_LDFLAGS = "";
|
||||||
|
"OTHER_LDFLAGS[arch=arm64]" = "-lkpx_cpu";
|
||||||
|
"OTHER_LDFLAGS[arch=x86_64]" = (
|
||||||
|
"-lkpx_cpu",
|
||||||
|
"-pagezero_size",
|
||||||
|
0x3000,
|
||||||
|
);
|
||||||
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
|
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.sheepshaver;
|
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.sheepshaver;
|
||||||
PRODUCT_NAME = SheepShaver;
|
PRODUCT_NAME = SheepShaver;
|
||||||
|
@ -1360,7 +1363,6 @@
|
||||||
ENABLE_MACOSX_ETHERHELPER,
|
ENABLE_MACOSX_ETHERHELPER,
|
||||||
"DATADIR=",
|
"DATADIR=",
|
||||||
HAVE_CONFIG_H,
|
HAVE_CONFIG_H,
|
||||||
USE_JIT,
|
|
||||||
"_GNU_SOURCE=1",
|
"_GNU_SOURCE=1",
|
||||||
_THREAD_SAFE,
|
_THREAD_SAFE,
|
||||||
_REENTRANT,
|
_REENTRANT,
|
||||||
|
@ -1390,7 +1392,13 @@
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
||||||
OTHER_CFLAGS = "";
|
OTHER_CFLAGS = "";
|
||||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||||
OTHER_LDFLAGS = "-lkpx_cpu";
|
OTHER_LDFLAGS = "";
|
||||||
|
"OTHER_LDFLAGS[arch=arm64]" = "-lkpx_cpu";
|
||||||
|
"OTHER_LDFLAGS[arch=x86_64]" = (
|
||||||
|
"-lkpx_cpu",
|
||||||
|
"-pagezero_size",
|
||||||
|
0x3000,
|
||||||
|
);
|
||||||
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
|
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.sheepshaver;
|
PRODUCT_BUNDLE_IDENTIFIER = net.cebix.sheepshaver;
|
||||||
PRODUCT_NAME = SheepShaver;
|
PRODUCT_NAME = SheepShaver;
|
||||||
|
|
|
@ -523,5 +523,7 @@
|
||||||
/* Define to 'int' if <sys/types.h> doesn't define. */
|
/* Define to 'int' if <sys/types.h> doesn't define. */
|
||||||
/* #undef socklen_t */
|
/* #undef socklen_t */
|
||||||
|
|
||||||
|
#define USE_JIT 1
|
||||||
|
|
||||||
#endif /* CONFIG_H */
|
#endif /* CONFIG_H */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user