ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #766 from reicast/fix/ios-and-osx 

Fix ios and osx (projectfiles, nvmem)
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-08-19 23:55:20 +02:00
parent 58cf586012 a4028154f9
commit f83130b84b
13 changed files with 308 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/deps/libpng/pngpriv.h
View File

@ -42,7 +42,7 @@
*/ */
#ifdef PNG_FLOATING_POINT_SUPPORTED #ifdef PNG_FLOATING_POINT_SUPPORTED
# ifdef MACOS # if 0
/* We need to check that <math.h> hasn't already been included earlier /* We need to check that <math.h> hasn't already been included earlier
* as it seems it doesn't agree with <fp.h>, yet we should really use * as it seems it doesn't agree with <fp.h>, yet we should really use
* <fp.h> if possible. * <fp.h> if possible.

4
core/hw/arm7/arm7.cpp
View File

@ -2157,7 +2157,11 @@ void armt_init()
verify(false); verify(false);
} }
#if TARGET_IPHONE
memset((u8*)mmap(ICache, ICacheSize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_ANON, 0, 0),0xFF,ICacheSize);
#else
memset(ICache,0xFF,ICacheSize); memset(ICache,0xFF,ICacheSize);
#endif
#endif #endif

4
core/hw/mem/_vmem.cpp
View File

@ -428,7 +428,9 @@ void _vmem_bm_reset() {
#if !defined(TARGET_NO_NVMEM) #if !defined(TARGET_NO_NVMEM)
_vmem_bm_reset_nvmem(); _vmem_bm_reset_nvmem();
#endif #endif
} else { }
if (!virt_ram_base || HOST_OS == OS_DARWIN) {
bm_vmem_pagefill((void**)p_sh4rcb->fpcb, FPCB_SIZE); bm_vmem_pagefill((void**)p_sh4rcb->fpcb, FPCB_SIZE);
} }
} }

6
core/hw/sh4/dyna/driver.cpp
View File

@ -53,7 +53,7 @@ void emit_SetBaseAddr() { LastAddr_min = LastAddr; }
void emit_WriteCodeCache() void emit_WriteCodeCache()
{ {
wchar path[512]; wchar path[512];
sprintf(path,"/code_cache_%08X.bin",CodeCache); sprintf(path,"/code_cache_%8p.bin",CodeCache);
string pt2=GetPath(path); string pt2=GetPath(path);
printf("Writing code cache to %s\n",pt2.c_str()); printf("Writing code cache to %s\n",pt2.c_str());
FILE*f=fopen(pt2.c_str(),"wb"); FILE*f=fopen(pt2.c_str(),"wb");
@ -455,7 +455,11 @@ void recSh4_Init()
} }
#endif #endif
#if TARGET_IPHONE
memset((u8*)mmap(CodeCache, CODE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_ANON, 0, 0),0xFF,CODE_SIZE);
#else
memset(CodeCache,0xFF,CODE_SIZE); memset(CodeCache,0xFF,CODE_SIZE);
#endif
#endif #endif
ngen_init(); ngen_init();

2
core/linux/common.cpp
View File

@ -248,7 +248,7 @@ void VArray2::UnLockRegion(u32 offset,u32 size)
if (rv!=0) if (rv!=0)
{ {
print_mem_addr(); print_mem_addr();
printf("mprotect(%08X,%08X,RW) failed: %d | %d\n",data+offset-inpage,size+inpage,rv,errno); printf("mprotect(%8p,%08X,RW) failed: %d | %d\n",data+offset-inpage,size+inpage,rv,errno);
die("mprotect failed ..\n"); die("mprotect failed ..\n");
} }
#else #else

3
core/rec-ARM/rec_arm.cpp
View File

@ -2232,6 +2232,9 @@ void ngen_ResetBlocks()
*/ */
void ngen_init() void ngen_init()
{ {
verify(FPCB_OFFSET == -0x2100000 || FPCB_OFFSET == -0x4100000);
verify(rcb_noffs(p_sh4rcb->fpcb) == FPCB_OFFSET);
for (int s=0;s<6;s++) for (int s=0;s<6;s++)
{ {
void* fn=s==0?(void*)_vmem_ReadMem8SX32: void* fn=s==0?(void*)_vmem_ReadMem8SX32:

6
core/types.h
View File

@ -430,6 +430,12 @@ struct maple_device_instance
#define puts(X) printf("%s\n", X) #define puts(X) printf("%s\n", X)
#endif #endif
#if HOST_OS == OS_DARWIN
int darw_printf(const wchar* Text,...);
#define printf darw_printf
#define puts(X) printf("%s\n", X)
#endif
//includes from c++rt //includes from c++rt
#include <vector> #include <vector>
#include <string> #include <string>

14
shell/apple/emulator-ios/emulator/ios_main.mm
View File

@ -37,6 +37,20 @@ int msgboxf(const wchar* text,unsigned int type,...)
return 0; return 0;
} }
int darw_printf(const wchar* text,...) {
va_list args;
wchar temp[2048];
va_start(args, text);
vsprintf(temp, text, args);
va_end(args);
NSLog(@"%s", temp);
return 0;
}
void common_linux_setup(); void common_linux_setup();
int dc_init(int argc,wchar* argv[]); int dc_init(int argc,wchar* argv[]);
void dc_run(); void dc_run();

10
shell/apple/emulator-ios/reicast-ios.xcodeproj/project.pbxproj
View File

@ -24,6 +24,7 @@
87078A9B18A47FE90034C7A0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 87078A9A18A47FE90034C7A0 /* AppDelegate.m */; }; 87078A9B18A47FE90034C7A0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 87078A9A18A47FE90034C7A0 /* AppDelegate.m */; };
87078AA318A47FE90034C7A0 /* Shader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = 87078AA218A47FE90034C7A0 /* Shader.fsh */; }; 87078AA318A47FE90034C7A0 /* Shader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = 87078AA218A47FE90034C7A0 /* Shader.fsh */; };
87078AA518A47FE90034C7A0 /* Shader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = 87078AA418A47FE90034C7A0 /* Shader.vsh */; }; 87078AA518A47FE90034C7A0 /* Shader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = 87078AA418A47FE90034C7A0 /* Shader.vsh */; };
876AA3771B818A4000617242 /* ini.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 876AA3751B818A4000617242 /* ini.cpp */; };
877652C21B6157BD00437F10 /* audiobackend_alsa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877652B61B6157BD00437F10 /* audiobackend_alsa.cpp */; }; 877652C21B6157BD00437F10 /* audiobackend_alsa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877652B61B6157BD00437F10 /* audiobackend_alsa.cpp */; };
877652C31B6157BD00437F10 /* audiobackend_directsound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877652B91B6157BD00437F10 /* audiobackend_directsound.cpp */; }; 877652C31B6157BD00437F10 /* audiobackend_directsound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877652B91B6157BD00437F10 /* audiobackend_directsound.cpp */; };
877652C41B6157BD00437F10 /* audiobackend_oss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877652BB1B6157BD00437F10 /* audiobackend_oss.cpp */; }; 877652C41B6157BD00437F10 /* audiobackend_oss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877652BB1B6157BD00437F10 /* audiobackend_oss.cpp */; };
@ -269,6 +270,8 @@
87078AA218A47FE90034C7A0 /* Shader.fsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = Shader.fsh; path = Shaders/Shader.fsh; sourceTree = "<group>"; }; 87078AA218A47FE90034C7A0 /* Shader.fsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = Shader.fsh; path = Shaders/Shader.fsh; sourceTree = "<group>"; };
87078AA418A47FE90034C7A0 /* Shader.vsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = Shader.vsh; path = Shaders/Shader.vsh; sourceTree = "<group>"; }; 87078AA418A47FE90034C7A0 /* Shader.vsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = Shader.vsh; path = Shaders/Shader.vsh; sourceTree = "<group>"; };
87078AB018A47FE90034C7A0 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 87078AB018A47FE90034C7A0 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
876AA3751B818A4000617242 /* ini.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ini.cpp; sourceTree = "<group>"; };
876AA3761B818A4000617242 /* ini.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ini.h; sourceTree = "<group>"; };
877652B61B6157BD00437F10 /* audiobackend_alsa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiobackend_alsa.cpp; sourceTree = "<group>"; }; 877652B61B6157BD00437F10 /* audiobackend_alsa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiobackend_alsa.cpp; sourceTree = "<group>"; };
877652B71B6157BD00437F10 /* audiobackend_alsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiobackend_alsa.h; sourceTree = "<group>"; }; 877652B71B6157BD00437F10 /* audiobackend_alsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiobackend_alsa.h; sourceTree = "<group>"; };
877652B81B6157BD00437F10 /* audiobackend_android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiobackend_android.h; sourceTree = "<group>"; }; 877652B81B6157BD00437F10 /* audiobackend_android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiobackend_android.h; sourceTree = "<group>"; };
@ -912,6 +915,8 @@
9C7A395018C806DE0070BB5F /* cfg */ = { 9C7A395018C806DE0070BB5F /* cfg */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
876AA3751B818A4000617242 /* ini.cpp */,
876AA3761B818A4000617242 /* ini.h */,
9C7A395118C806DE0070BB5F /* cfg.cpp */, 9C7A395118C806DE0070BB5F /* cfg.cpp */,
9C7A395218C806DE0070BB5F /* cfg.h */, 9C7A395218C806DE0070BB5F /* cfg.h */,
9C7A395318C806DE0070BB5F /* cl.cpp */, 9C7A395318C806DE0070BB5F /* cl.cpp */,
@ -1613,6 +1618,7 @@
9C7A3AB118C806E00070BB5F /* pngread.c in Sources */, 9C7A3AB118C806E00070BB5F /* pngread.c in Sources */,
9C7A3AAC18C806E00070BB5F /* png.c in Sources */, 9C7A3AAC18C806E00070BB5F /* png.c in Sources */,
9C7A3AC718C806E00070BB5F /* zip_error_get_sys_type.c in Sources */, 9C7A3AC718C806E00070BB5F /* zip_error_get_sys_type.c in Sources */,
876AA3771B818A4000617242 /* ini.cpp in Sources */,
9C7A3B3618C806E00070BB5F /* chd.cpp in Sources */, 9C7A3B3618C806E00070BB5F /* chd.cpp in Sources */,
9C7A3B2118C806E00070BB5F /* sh4_fpu.cpp in Sources */, 9C7A3B2118C806E00070BB5F /* sh4_fpu.cpp in Sources */,
9C7A3B3218C806E00070BB5F /* sh4_opcode_list.cpp in Sources */, 9C7A3B3218C806E00070BB5F /* sh4_opcode_list.cpp in Sources */,
@ -1805,7 +1811,7 @@
87078AC118A47FE90034C7A0 /* Debug */ = { 87078AC118A47FE90034C7A0 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD)"; ARCHS = armv7;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -1840,7 +1846,7 @@
87078AC218A47FE90034C7A0 /* Release */ = { 87078AC218A47FE90034C7A0 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD)"; ARCHS = armv7;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;

12
shell/apple/emulator-osx/emulator-osx/osx-main.mm
View File

@ -25,6 +25,18 @@ int msgboxf(const wchar* text,unsigned int type,...)
return 0; return 0;
} }
int darw_printf(const wchar* text,...) {
va_list args;
wchar temp[2048];
va_start(args, text);
vsprintf(temp, text, args);
va_end(args);
NSLog(@"%s", temp);
return 0;
}
u16 kcode[4] = { 0xFFFF }; u16 kcode[4] = { 0xFFFF };
u32 vks[4]; u32 vks[4];

48
shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
View File

@ -7,6 +7,7 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
8491687F1B782B2D00F3F2B4 /* ini.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8491687D1B782B2D00F3F2B4 /* ini.cpp */; };
84A388B91B1CDD3E000166C0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A388B81B1CDD3E000166C0 /* AppDelegate.swift */; }; 84A388B91B1CDD3E000166C0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A388B81B1CDD3E000166C0 /* AppDelegate.swift */; };
84A388BB1B1CDD3E000166C0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 84A388BA1B1CDD3E000166C0 /* Images.xcassets */; }; 84A388BB1B1CDD3E000166C0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 84A388BA1B1CDD3E000166C0 /* Images.xcassets */; };
84A388BE1B1CDD3E000166C0 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84A388BC1B1CDD3E000166C0 /* MainMenu.xib */; }; 84A388BE1B1CDD3E000166C0 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84A388BC1B1CDD3E000166C0 /* MainMenu.xib */; };
@ -201,12 +202,14 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
84A388B31B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 8491687D1B782B2D00F3F2B4 /* ini.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ini.cpp; sourceTree = "<group>"; };
8491687E1B782B2D00F3F2B4 /* ini.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ini.h; sourceTree = "<group>"; };
84A388B31B1CDD3E000166C0 /* reicast-osx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "reicast-osx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
84A388B71B1CDD3E000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 84A388B71B1CDD3E000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
84A388B81B1CDD3E000166C0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 84A388B81B1CDD3E000166C0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
84A388BA1B1CDD3E000166C0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; }; 84A388BA1B1CDD3E000166C0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
84A388BD1B1CDD3E000166C0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; }; 84A388BD1B1CDD3E000166C0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
84A388C31B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 84A388C31B1CDD3F000166C0 /* reicast-osxTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "reicast-osxTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
84A388C81B1CDD3F000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 84A388C81B1CDD3F000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
84A388C91B1CDD3F000166C0 /* emulator_osxTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = emulator_osxTests.swift; sourceTree = "<group>"; }; 84A388C91B1CDD3F000166C0 /* emulator_osxTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = emulator_osxTests.swift; sourceTree = "<group>"; };
84B7BD121B72720100F9733F /* build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build.h; path = ../../../core/build.h; sourceTree = "<group>"; }; 84B7BD121B72720100F9733F /* build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build.h; path = ../../../core/build.h; sourceTree = "<group>"; };
@ -555,8 +558,8 @@
84A388B41B1CDD3E000166C0 /* Products */ = { 84A388B41B1CDD3E000166C0 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
84A388B31B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app */, 84A388B31B1CDD3E000166C0 /* reicast-osx.app */,
84A388C31B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest */, 84A388C31B1CDD3F000166C0 /* reicast-osxTests.xctest */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@ -630,6 +633,8 @@
84B7BD131B72720100F9733F /* cfg */ = { 84B7BD131B72720100F9733F /* cfg */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
8491687D1B782B2D00F3F2B4 /* ini.cpp */,
8491687E1B782B2D00F3F2B4 /* ini.h */,
84B7BD141B72720100F9733F /* cfg.cpp */, 84B7BD141B72720100F9733F /* cfg.cpp */,
84B7BD151B72720100F9733F /* cfg.h */, 84B7BD151B72720100F9733F /* cfg.h */,
84B7BD161B72720100F9733F /* cl.cpp */, 84B7BD161B72720100F9733F /* cl.cpp */,
@ -1246,9 +1251,9 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
84A388B21B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename */ = { 84A388B21B1CDD3E000166C0 /* reicast-osx */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename" */; buildConfigurationList = 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx" */;
buildPhases = ( buildPhases = (
84A388AF1B1CDD3E000166C0 /* Sources */, 84A388AF1B1CDD3E000166C0 /* Sources */,
84A388B01B1CDD3E000166C0 /* Frameworks */, 84A388B01B1CDD3E000166C0 /* Frameworks */,
@ -1258,14 +1263,14 @@
); );
dependencies = ( dependencies = (
); );
name = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename"; name = "reicast-osx";
productName = "reicast-osx"; productName = "reicast-osx";
productReference = 84A388B31B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app */; productReference = 84A388B31B1CDD3E000166C0 /* reicast-osx.app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
84A388C21B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests */ = { 84A388C21B1CDD3F000166C0 /* reicast-osxTests */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests" */; buildConfigurationList = 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osxTests" */;
buildPhases = ( buildPhases = (
84A388BF1B1CDD3F000166C0 /* Sources */, 84A388BF1B1CDD3F000166C0 /* Sources */,
84A388C01B1CDD3F000166C0 /* Frameworks */, 84A388C01B1CDD3F000166C0 /* Frameworks */,
@ -1276,9 +1281,9 @@
dependencies = ( dependencies = (
84A388C51B1CDD3F000166C0 /* PBXTargetDependency */, 84A388C51B1CDD3F000166C0 /* PBXTargetDependency */,
); );
name = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests"; name = "reicast-osxTests";
productName = "reicast-osxTests"; productName = "reicast-osxTests";
productReference = 84A388C31B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest */; productReference = 84A388C31B1CDD3F000166C0 /* reicast-osxTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test"; productType = "com.apple.product-type.bundle.unit-test";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@ -1312,8 +1317,8 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
84A388B21B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename */, 84A388B21B1CDD3E000166C0 /* reicast-osx */,
84A388C21B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests */, 84A388C21B1CDD3F000166C0 /* reicast-osxTests */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@ -1428,6 +1433,7 @@
84B7BEE01B72720200F9733F /* mkstemp.c in Sources */, 84B7BEE01B72720200F9733F /* mkstemp.c in Sources */,
84B7BF261B72720200F9733F /* aica_if.cpp in Sources */, 84B7BF261B72720200F9733F /* aica_if.cpp in Sources */,
84B7BF171B72720200F9733F /* compress.c in Sources */, 84B7BF171B72720200F9733F /* compress.c in Sources */,
8491687F1B782B2D00F3F2B4 /* ini.cpp in Sources */,
84B7BF341B72720200F9733F /* maple_cfg.cpp in Sources */, 84B7BF341B72720200F9733F /* maple_cfg.cpp in Sources */,
84B7BF401B72720200F9733F /* ta_ctx.cpp in Sources */, 84B7BF401B72720200F9733F /* ta_ctx.cpp in Sources */,
84B7BF011B72720200F9733F /* zip_open.c in Sources */, 84B7BF011B72720200F9733F /* zip_open.c in Sources */,
@ -1536,7 +1542,7 @@
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
84A388C51B1CDD3F000166C0 /* PBXTargetDependency */ = { 84A388C51B1CDD3F000166C0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 84A388B21B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename */; target = 84A388B21B1CDD3E000166C0 /* reicast-osx */;
targetProxy = 84A388C41B1CDD3F000166C0 /* PBXContainerItemProxy */; targetProxy = 84A388C41B1CDD3F000166C0 /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
@ -1653,7 +1659,7 @@
); );
INFOPLIST_FILE = "emulator-osx/Info.plist"; INFOPLIST_FILE = "emulator-osx/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename"; PRODUCT_NAME = "reicast-osx";
SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h";
}; };
name = Debug; name = Debug;
@ -1681,7 +1687,7 @@
); );
INFOPLIST_FILE = "emulator-osx/Info.plist"; INFOPLIST_FILE = "emulator-osx/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename"; PRODUCT_NAME = "reicast-osx";
SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h";
}; };
name = Release; name = Release;
@ -1701,7 +1707,7 @@
); );
INFOPLIST_FILE = "emulator-osxTests/Info.plist"; INFOPLIST_FILE = "emulator-osxTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests"; PRODUCT_NAME = "reicast-osxTests";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/reicast-osx.app/Contents/MacOS/reicast-osx"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/reicast-osx.app/Contents/MacOS/reicast-osx";
}; };
name = Debug; name = Debug;
@ -1717,7 +1723,7 @@
); );
INFOPLIST_FILE = "emulator-osxTests/Info.plist"; INFOPLIST_FILE = "emulator-osxTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests"; PRODUCT_NAME = "reicast-osxTests";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/reicast-osx.app/Contents/MacOS/reicast-osx"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/reicast-osx.app/Contents/MacOS/reicast-osx";
}; };
name = Release; name = Release;
@ -1734,7 +1740,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename" */ = { 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
84A388CE1B1CDD3F000166C0 /* Debug */, 84A388CE1B1CDD3F000166C0 /* Debug */,
@ -1743,7 +1749,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests" */ = { 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osxTests" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
84A388D11B1CDD3F000166C0 /* Debug */, 84A388D11B1CDD3F000166C0 /* Debug */,

100
shell/apple/reicast.xcworkspace/xcshareddata/xcschemes/reicast-ios.xcscheme Normal file
View File

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "87078A8218A47FE90034C7A0"
BuildableName = "reicast-ios.app"
BlueprintName = "reicast-ios"
ReferencedContainer = "container:emulator-ios/reicast-ios.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "849168B11B78C61500F3F2B4"
BuildableName = "reicast-ios copy.app"
BlueprintName = "reicast-ios-naomi"
ReferencedContainer = "container:emulator-ios/reicast-ios.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "87078A8218A47FE90034C7A0"
BuildableName = "reicast-ios.app"
BlueprintName = "reicast-ios"
ReferencedContainer = "container:emulator-ios/reicast-ios.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "87078A8218A47FE90034C7A0"
BuildableName = "reicast-ios.app"
BlueprintName = "reicast-ios"
ReferencedContainer = "container:emulator-ios/reicast-ios.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "87078A8218A47FE90034C7A0"
BuildableName = "reicast-ios.app"
BlueprintName = "reicast-ios"
ReferencedContainer = "container:emulator-ios/reicast-ios.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

124
shell/apple/reicast.xcworkspace/xcshareddata/xcschemes/reicast-osx.xcscheme Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "reicast-osx.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388C21B1CDD3F000166C0"
BuildableName = "reicast-osxTests.xctest"
BlueprintName = "reicast-osxTests"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "849169A01B78C80B00F3F2B4"
BuildableName = "reicast-osx copy.app"
BlueprintName = "reicast-osx-naomi"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388C21B1CDD3F000166C0"
BuildableName = "reicast-osxTests.xctest"
BlueprintName = "reicast-osxTests"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "reicast-osx.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "reicast-osx.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "reicast-osx.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:emulator-osx/reicast-osx.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>