--- hatari/Hatari.xcodeproj/project.pbxproj 2019/04/01 07:12:54 1.1.1.1 +++ hatari/Hatari.xcodeproj/project.pbxproj 2019/04/01 07:13:25 1.1.1.2 @@ -7,6 +7,30 @@ objects = { /* Begin PBXBuildFile section */ + 961322D70B5BCDB900007C3E /* acsite.m4 in Resources */ = {isa = PBXBuildFile; fileRef = 961322D20B5BCDB900007C3E /* acsite.m4 */; }; + 961322D80B5BCDB900007C3E /* config-default.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322D30B5BCDB900007C3E /* config-default.h */; }; + 961322DA0B5BCDB900007C3E /* Makefile-default.cnf in Resources */ = {isa = PBXBuildFile; fileRef = 961322D50B5BCDB900007C3E /* Makefile-default.cnf */; }; + 961322DB0B5BCDB900007C3E /* Makefile-MinGW.cnf in Resources */ = {isa = PBXBuildFile; fileRef = 961322D60B5BCDB900007C3E /* Makefile-MinGW.cnf */; }; + 961322E70B5BCFBB00007C3E /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322E60B5BCFBB00007C3E /* config.h */; }; + 961322FB0B5BD0B800007C3E /* araglue.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322EF0B5BD0B800007C3E /* araglue.h */; }; + 961322FC0B5BD0B800007C3E /* dsp_cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 961322F00B5BD0B800007C3E /* dsp_cpu.c */; }; + 961322FD0B5BD0B800007C3E /* dsp_cpu.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322F10B5BD0B800007C3E /* dsp_cpu.h */; }; + 961322FE0B5BD0B800007C3E /* dsp_disasm.c in Sources */ = {isa = PBXBuildFile; fileRef = 961322F20B5BD0B800007C3E /* dsp_disasm.c */; }; + 961322FF0B5BD0B800007C3E /* dsp_disasm.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322F30B5BD0B800007C3E /* dsp_disasm.h */; }; + 961323000B5BD0B800007C3E /* dsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 961322F40B5BD0B800007C3E /* dsp.c */; }; + 961323010B5BD0B800007C3E /* dsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322F50B5BD0B800007C3E /* dsp.h */; }; + 961323020B5BD0B800007C3E /* hostscreen.c in Sources */ = {isa = PBXBuildFile; fileRef = 961322F60B5BD0B800007C3E /* hostscreen.c */; }; + 961323030B5BD0B800007C3E /* hostscreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322F70B5BD0B800007C3E /* hostscreen.h */; }; + 961323050B5BD0B800007C3E /* videl.c in Sources */ = {isa = PBXBuildFile; fileRef = 961322F90B5BD0B800007C3E /* videl.c */; }; + 961323060B5BD0B800007C3E /* videl.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322FA0B5BD0B800007C3E /* videl.h */; }; + 9613230C0B5BD14B00007C3E /* ioMemTabFalcon.c in Sources */ = {isa = PBXBuildFile; fileRef = 961323070B5BD14B00007C3E /* ioMemTabFalcon.c */; }; + 9613230D0B5BD14B00007C3E /* ioMemTabST.c in Sources */ = {isa = PBXBuildFile; fileRef = 961323080B5BD14B00007C3E /* ioMemTabST.c */; }; + 9613230E0B5BD14B00007C3E /* ioMemTabSTE.c in Sources */ = {isa = PBXBuildFile; fileRef = 961323090B5BD14B00007C3E /* ioMemTabSTE.c */; }; + 9613230F0B5BD14B00007C3E /* ioMemTabTT.c in Sources */ = {isa = PBXBuildFile; fileRef = 9613230A0B5BD14B00007C3E /* ioMemTabTT.c */; }; + 961323130B5BD17700007C3E /* ide.h in Headers */ = {isa = PBXBuildFile; fileRef = 961323110B5BD17700007C3E /* ide.h */; }; + 961323300B5BD66600007C3E /* ide.c in Sources */ = {isa = PBXBuildFile; fileRef = 9613232F0B5BD66600007C3E /* ide.c */; }; + 96635B770BF86FDF00518B3B /* nvram.c in Sources */ = {isa = PBXBuildFile; fileRef = 96635B750BF86FDF00518B3B /* nvram.c */; }; + 96635B780BF86FDF00518B3B /* nvram.h in Headers */ = {isa = PBXBuildFile; fileRef = 96635B760BF86FDF00518B3B /* nvram.h */; }; 9670E1100A5FA132009A73E0 /* SDLMain.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A47A9D01A0482F01D3D55B /* SDLMain.h */; }; 9670E1110A5FA132009A73E0 /* font10x16.h in Headers */ = {isa = PBXBuildFile; fileRef = E9283E9607512EA200DA6B24 /* font10x16.h */; }; 9670E1120A5FA132009A73E0 /* font5x8.h in Headers */ = {isa = PBXBuildFile; fileRef = E9283E9807512EA200DA6B24 /* font5x8.h */; }; @@ -98,13 +122,11 @@ 9670E16A0A5FA132009A73E0 /* dlgAbout.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8707512EA200DA6B24 /* dlgAbout.c */; }; 9670E16B0A5FA132009A73E0 /* dlgAlert.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8807512EA200DA6B24 /* dlgAlert.c */; }; 9670E16C0A5FA132009A73E0 /* dlgDevice.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8907512EA200DA6B24 /* dlgDevice.c */; }; - 9670E16D0A5FA132009A73E0 /* dlgDisc.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8A07512EA200DA6B24 /* dlgDisc.c */; }; 9670E16E0A5FA132009A73E0 /* dlgFileSelect.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8B07512EA200DA6B24 /* dlgFileSelect.c */; }; 9670E16F0A5FA132009A73E0 /* dlgJoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8C07512EA200DA6B24 /* dlgJoystick.c */; }; 9670E1700A5FA132009A73E0 /* dlgKeyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8D07512EA200DA6B24 /* dlgKeyboard.c */; }; 9670E1710A5FA132009A73E0 /* dlgMain.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8E07512EA200DA6B24 /* dlgMain.c */; }; 9670E1720A5FA132009A73E0 /* dlgMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E8F07512EA200DA6B24 /* dlgMemory.c */; }; - 9670E1730A5FA132009A73E0 /* dlgNewDisc.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E9007512EA200DA6B24 /* dlgNewDisc.c */; }; 9670E1740A5FA132009A73E0 /* dlgScreen.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E9107512EA200DA6B24 /* dlgScreen.c */; }; 9670E1750A5FA132009A73E0 /* dlgSound.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E9207512EA200DA6B24 /* dlgSound.c */; }; 9670E1760A5FA132009A73E0 /* dlgSystem.c in Sources */ = {isa = PBXBuildFile; fileRef = E9283E9307512EA200DA6B24 /* dlgSystem.c */; }; @@ -150,7 +172,6 @@ 9670E19E0A5FA132009A73E0 /* cpudefs.c in Sources */ = {isa = PBXBuildFile; fileRef = E9987A7B075135D6007DC37B /* cpudefs.c */; }; 9670E19F0A5FA132009A73E0 /* cpustbl.c in Sources */ = {isa = PBXBuildFile; fileRef = E9987A7C075135D6007DC37B /* cpustbl.c */; }; 9670E1A00A5FA132009A73E0 /* ioMem.c in Sources */ = {isa = PBXBuildFile; fileRef = E99035B107E8C909000E7CD7 /* ioMem.c */; }; - 9670E1A10A5FA132009A73E0 /* ioMemTables.c in Sources */ = {isa = PBXBuildFile; fileRef = E99035B207E8C909000E7CD7 /* ioMemTables.c */; }; 9670E1A20A5FA132009A73E0 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = E9933BC20802F0F800E20172 /* log.c */; }; 9670E1A30A5FA132009A73E0 /* dmaSnd.c in Sources */ = {isa = PBXBuildFile; fileRef = E930274E08EC5CD0000FB60E /* dmaSnd.c */; }; 9670E1A40A5FA132009A73E0 /* cycles.c in Sources */ = {isa = PBXBuildFile; fileRef = 9652821A0998134C00BE6A34 /* cycles.c */; }; @@ -162,6 +183,14 @@ 9670E1AA0A5FA132009A73E0 /* options.c in Sources */ = {isa = PBXBuildFile; fileRef = 968DE4D30A59B234007517A4 /* options.c */; }; 9670E1AC0A5FA132009A73E0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 9670E1C20A5FA25A009A73E0 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9670E1C10A5FA25A009A73E0 /* SDL.framework */; }; + 968B50F00D83704D00C21920 /* dlgDisk.c in Sources */ = {isa = PBXBuildFile; fileRef = 968B50EE0D83704D00C21920 /* dlgDisk.c */; }; + 968B50F10D83704D00C21920 /* dlgNewDisk.c in Sources */ = {isa = PBXBuildFile; fileRef = 968B50EF0D83704D00C21920 /* dlgNewDisk.c */; }; + 969191280AA205A80008B3A0 /* scandir.c in Sources */ = {isa = PBXBuildFile; fileRef = 969191270AA205A80008B3A0 /* scandir.c */; }; + 9691912A0AA205D60008B3A0 /* scandir.h in Headers */ = {isa = PBXBuildFile; fileRef = 969191290AA205D60008B3A0 /* scandir.h */; }; + 96B15D550D836F8F000326A2 /* paths.h in Headers */ = {isa = PBXBuildFile; fileRef = 96B15D540D836F8F000326A2 /* paths.h */; }; + 96B15D570D836F9A000326A2 /* trace.h in Headers */ = {isa = PBXBuildFile; fileRef = 96B15D560D836F9A000326A2 /* trace.h */; }; + 96B15D5A0D836FC0000326A2 /* paths.c in Sources */ = {isa = PBXBuildFile; fileRef = 96B15D580D836FC0000326A2 /* paths.c */; }; + 96B15D5B0D836FC0000326A2 /* trace.c in Sources */ = {isa = PBXBuildFile; fileRef = 96B15D590D836FC0000326A2 /* trace.c */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -179,16 +208,48 @@ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 961322D20B5BCDB900007C3E /* acsite.m4 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = acsite.m4; sourceTree = ""; }; + 961322D30B5BCDB900007C3E /* config-default.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-default.h"; sourceTree = ""; }; + 961322D50B5BCDB900007C3E /* Makefile-default.cnf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Makefile-default.cnf"; sourceTree = ""; }; + 961322D60B5BCDB900007C3E /* Makefile-MinGW.cnf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Makefile-MinGW.cnf"; sourceTree = ""; }; + 961322E60B5BCFBB00007C3E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; + 961322EF0B5BD0B800007C3E /* araglue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = araglue.h; path = src/falcon/araglue.h; sourceTree = ""; }; + 961322F00B5BD0B800007C3E /* dsp_cpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsp_cpu.c; path = src/falcon/dsp_cpu.c; sourceTree = ""; }; + 961322F10B5BD0B800007C3E /* dsp_cpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsp_cpu.h; path = src/falcon/dsp_cpu.h; sourceTree = ""; }; + 961322F20B5BD0B800007C3E /* dsp_disasm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsp_disasm.c; path = src/falcon/dsp_disasm.c; sourceTree = ""; }; + 961322F30B5BD0B800007C3E /* dsp_disasm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsp_disasm.h; path = src/falcon/dsp_disasm.h; sourceTree = ""; }; + 961322F40B5BD0B800007C3E /* dsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsp.c; path = src/falcon/dsp.c; sourceTree = ""; }; + 961322F50B5BD0B800007C3E /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsp.h; path = src/falcon/dsp.h; sourceTree = ""; }; + 961322F60B5BD0B800007C3E /* hostscreen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hostscreen.c; path = src/falcon/hostscreen.c; sourceTree = ""; }; + 961322F70B5BD0B800007C3E /* hostscreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hostscreen.h; path = src/falcon/hostscreen.h; sourceTree = ""; }; + 961322F90B5BD0B800007C3E /* videl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = videl.c; path = src/falcon/videl.c; sourceTree = ""; }; + 961322FA0B5BD0B800007C3E /* videl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = videl.h; path = src/falcon/videl.h; sourceTree = ""; }; + 961323070B5BD14B00007C3E /* ioMemTabFalcon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioMemTabFalcon.c; path = src/ioMemTabFalcon.c; sourceTree = ""; }; + 961323080B5BD14B00007C3E /* ioMemTabST.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioMemTabST.c; path = src/ioMemTabST.c; sourceTree = ""; }; + 961323090B5BD14B00007C3E /* ioMemTabSTE.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioMemTabSTE.c; path = src/ioMemTabSTE.c; sourceTree = ""; }; + 9613230A0B5BD14B00007C3E /* ioMemTabTT.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioMemTabTT.c; path = src/ioMemTabTT.c; sourceTree = ""; }; + 961323110B5BD17700007C3E /* ide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ide.h; path = src/includes/ide.h; sourceTree = ""; }; + 9613232F0B5BD66600007C3E /* ide.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ide.c; path = src/ide.c; sourceTree = ""; }; 962F64E909A922B20054BE9B /* PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefsController.h; sourceTree = ""; }; 962F64EA09A922B20054BE9B /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrefsController.m; sourceTree = ""; }; 9652821A0998134C00BE6A34 /* cycles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cycles.c; path = src/cycles.c; sourceTree = ""; }; 9652821F0998136500BE6A34 /* cycles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cycles.h; sourceTree = ""; }; + 96635B750BF86FDF00518B3B /* nvram.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nvram.c; path = src/falcon/nvram.c; sourceTree = ""; }; + 96635B760BF86FDF00518B3B /* nvram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nvram.h; path = src/falcon/nvram.h; sourceTree = ""; }; 9670E1B00A5FA132009A73E0 /* Info-Hatari.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Hatari.plist"; sourceTree = ""; }; 9670E1B10A5FA132009A73E0 /* Hatari.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hatari.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9670E1C10A5FA25A009A73E0 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; + 968B50EE0D83704D00C21920 /* dlgDisk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlgDisk.c; sourceTree = ""; }; + 968B50EF0D83704D00C21920 /* dlgNewDisk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlgNewDisk.c; sourceTree = ""; }; 968DE4CE0A59B1E8007517A4 /* gemdos_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gemdos_defines.h; sourceTree = ""; }; 968DE4CF0A59B1E8007517A4 /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = options.h; sourceTree = ""; }; 968DE4D30A59B234007517A4 /* options.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = options.c; path = src/options.c; sourceTree = ""; }; + 969191270AA205A80008B3A0 /* scandir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = scandir.c; path = src/scandir.c; sourceTree = ""; }; + 969191290AA205D60008B3A0 /* scandir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scandir.h; sourceTree = ""; }; + 96B15D540D836F8F000326A2 /* paths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paths.h; sourceTree = ""; }; + 96B15D560D836F9A000326A2 /* trace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trace.h; sourceTree = ""; }; + 96B15D580D836FC0000326A2 /* paths.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = paths.c; path = src/paths.c; sourceTree = ""; }; + 96B15D590D836FC0000326A2 /* trace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = trace.c; path = src/trace.c; sourceTree = ""; }; 96BEBB3F0A567AC0007ADA48 /* AlertHooks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlertHooks.h; sourceTree = ""; }; 96BEBB400A567AC0007ADA48 /* AlertHooks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlertHooks.m; sourceTree = ""; }; 96C84DB40A549F4B00CAF172 /* Shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shared.h; sourceTree = ""; }; @@ -216,13 +277,11 @@ E9283E8707512EA200DA6B24 /* dlgAbout.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgAbout.c; sourceTree = ""; }; E9283E8807512EA200DA6B24 /* dlgAlert.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgAlert.c; sourceTree = ""; }; E9283E8907512EA200DA6B24 /* dlgDevice.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgDevice.c; sourceTree = ""; }; - E9283E8A07512EA200DA6B24 /* dlgDisc.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgDisc.c; sourceTree = ""; }; E9283E8B07512EA200DA6B24 /* dlgFileSelect.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgFileSelect.c; sourceTree = ""; }; E9283E8C07512EA200DA6B24 /* dlgJoystick.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgJoystick.c; sourceTree = ""; }; E9283E8D07512EA200DA6B24 /* dlgKeyboard.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgKeyboard.c; sourceTree = ""; }; E9283E8E07512EA200DA6B24 /* dlgMain.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgMain.c; sourceTree = ""; }; E9283E8F07512EA200DA6B24 /* dlgMemory.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgMemory.c; sourceTree = ""; }; - E9283E9007512EA200DA6B24 /* dlgNewDisc.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgNewDisc.c; sourceTree = ""; }; E9283E9107512EA200DA6B24 /* dlgScreen.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgScreen.c; sourceTree = ""; }; E9283E9207512EA200DA6B24 /* dlgSound.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgSound.c; sourceTree = ""; }; E9283E9307512EA200DA6B24 /* dlgSystem.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dlgSystem.c; sourceTree = ""; }; @@ -329,7 +388,6 @@ E99035AD07E8C8D6000E7CD7 /* ioMem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ioMem.h; sourceTree = ""; }; E99035AE07E8C8D6000E7CD7 /* ioMemTables.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ioMemTables.h; sourceTree = ""; }; E99035B107E8C909000E7CD7 /* ioMem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ioMem.c; path = src/ioMem.c; sourceTree = ""; }; - E99035B207E8C909000E7CD7 /* ioMemTables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ioMemTables.c; path = src/ioMemTables.c; sourceTree = ""; }; E9933BC00802F0DF00E20172 /* log.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = ""; }; E9933BC20802F0F800E20172 /* log.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = log.c; path = src/log.c; sourceTree = ""; }; E9987A66075134AA007DC37B /* cpuemu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = cpuemu.c; sourceTree = ""; }; @@ -381,6 +439,12 @@ 29B97314FDCFA39411CA2CEA /* Hatari */ = { isa = PBXGroup; children = ( + 9613232F0B5BD66600007C3E /* ide.c */, + 961322E60B5BCFBB00007C3E /* config.h */, + 961322D20B5BCDB900007C3E /* acsite.m4 */, + 961322D30B5BCDB900007C3E /* config-default.h */, + 961322D50B5BCDB900007C3E /* Makefile-default.cnf */, + 961322D60B5BCDB900007C3E /* Makefile-MinGW.cnf */, 96D6324C0A4E9A4300FBFA27 /* gui-osx */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, @@ -394,6 +458,27 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 96B15D580D836FC0000326A2 /* paths.c */, + 96B15D590D836FC0000326A2 /* trace.c */, + 96635B750BF86FDF00518B3B /* nvram.c */, + 96635B760BF86FDF00518B3B /* nvram.h */, + 961323110B5BD17700007C3E /* ide.h */, + 961323070B5BD14B00007C3E /* ioMemTabFalcon.c */, + 961323080B5BD14B00007C3E /* ioMemTabST.c */, + 961323090B5BD14B00007C3E /* ioMemTabSTE.c */, + 9613230A0B5BD14B00007C3E /* ioMemTabTT.c */, + 961322EF0B5BD0B800007C3E /* araglue.h */, + 961322F00B5BD0B800007C3E /* dsp_cpu.c */, + 961322F10B5BD0B800007C3E /* dsp_cpu.h */, + 961322F20B5BD0B800007C3E /* dsp_disasm.c */, + 961322F30B5BD0B800007C3E /* dsp_disasm.h */, + 961322F40B5BD0B800007C3E /* dsp.c */, + 961322F50B5BD0B800007C3E /* dsp.h */, + 961322F60B5BD0B800007C3E /* hostscreen.c */, + 961322F70B5BD0B800007C3E /* hostscreen.h */, + 961322F90B5BD0B800007C3E /* videl.c */, + 961322FA0B5BD0B800007C3E /* videl.h */, + 969191270AA205A80008B3A0 /* scandir.c */, 968DE4D30A59B234007517A4 /* options.c */, E930274E08EC5CD0000FB60E /* dmaSnd.c */, E9283E7307512EA200DA6B24 /* audio.c */, @@ -418,7 +503,6 @@ E9283E9D07512EA200DA6B24 /* includes */, E9283ED307512EA200DA6B24 /* int.c */, E99035B107E8C909000E7CD7 /* ioMem.c */, - E99035B207E8C909000E7CD7 /* ioMemTables.c */, E9283ED507512EA200DA6B24 /* joy.c */, E9283ED607512EA200DA6B24 /* keymap.c */, E9933BC20802F0F800E20172 /* log.c */, @@ -494,17 +578,17 @@ E9283E8507512EA200DA6B24 /* gui-sdl */ = { isa = PBXGroup; children = ( + 968B50EE0D83704D00C21920 /* dlgDisk.c */, + 968B50EF0D83704D00C21920 /* dlgNewDisk.c */, 96CD27820A58443F008DE57F /* dlgRom.c */, E9283E8707512EA200DA6B24 /* dlgAbout.c */, E9283E8807512EA200DA6B24 /* dlgAlert.c */, E9283E8907512EA200DA6B24 /* dlgDevice.c */, - E9283E8A07512EA200DA6B24 /* dlgDisc.c */, E9283E8B07512EA200DA6B24 /* dlgFileSelect.c */, E9283E8C07512EA200DA6B24 /* dlgJoystick.c */, E9283E8D07512EA200DA6B24 /* dlgKeyboard.c */, E9283E8E07512EA200DA6B24 /* dlgMain.c */, E9283E8F07512EA200DA6B24 /* dlgMemory.c */, - E9283E9007512EA200DA6B24 /* dlgNewDisc.c */, E9283E9107512EA200DA6B24 /* dlgScreen.c */, E9283E9207512EA200DA6B24 /* dlgSound.c */, E9283E9307512EA200DA6B24 /* dlgSystem.c */, @@ -519,6 +603,9 @@ E9283E9D07512EA200DA6B24 /* includes */ = { isa = PBXGroup; children = ( + 96B15D560D836F9A000326A2 /* trace.h */, + 96B15D540D836F8F000326A2 /* paths.h */, + 969191290AA205D60008B3A0 /* scandir.h */, 968DE4CE0A59B1E8007517A4 /* gemdos_defines.h */, 968DE4CF0A59B1E8007517A4 /* options.h */, 9652821F0998136500BE6A34 /* cycles.h */, @@ -682,6 +769,19 @@ 9670E1530A5FA132009A73E0 /* AlertHooks.h in Headers */, 9670E1540A5FA132009A73E0 /* gemdos_defines.h in Headers */, 9670E1550A5FA132009A73E0 /* options.h in Headers */, + 9691912A0AA205D60008B3A0 /* scandir.h in Headers */, + 961322D80B5BCDB900007C3E /* config-default.h in Headers */, + 961322E70B5BCFBB00007C3E /* config.h in Headers */, + 961322FB0B5BD0B800007C3E /* araglue.h in Headers */, + 961322FD0B5BD0B800007C3E /* dsp_cpu.h in Headers */, + 961322FF0B5BD0B800007C3E /* dsp_disasm.h in Headers */, + 961323010B5BD0B800007C3E /* dsp.h in Headers */, + 961323030B5BD0B800007C3E /* hostscreen.h in Headers */, + 961323060B5BD0B800007C3E /* videl.h in Headers */, + 961323130B5BD17700007C3E /* ide.h in Headers */, + 96635B780BF86FDF00518B3B /* nvram.h in Headers */, + 96B15D550D836F8F000326A2 /* paths.h in Headers */, + 96B15D570D836F9A000326A2 /* trace.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -731,9 +831,11 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 96F027C90998116700577C54 /* Build configuration list for PBXProject "Hatari" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* Hatari */; projectDirPath = ""; + projectRoot = ""; targets = ( 9670E10C0A5FA132009A73E0 /* Hatari */, E97980AD07513008008815D3 /* cpuemu.c */, @@ -749,6 +851,9 @@ 9670E1570A5FA132009A73E0 /* InfoPlist.strings in Resources */, 9670E1580A5FA132009A73E0 /* SDLMain.nib in Resources */, 9670E1590A5FA132009A73E0 /* Hatari.icns in Resources */, + 961322D70B5BCDB900007C3E /* acsite.m4 in Resources */, + 961322DA0B5BCDB900007C3E /* Makefile-default.cnf in Resources */, + 961322DB0B5BCDB900007C3E /* Makefile-MinGW.cnf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -777,13 +882,11 @@ 9670E16A0A5FA132009A73E0 /* dlgAbout.c in Sources */, 9670E16B0A5FA132009A73E0 /* dlgAlert.c in Sources */, 9670E16C0A5FA132009A73E0 /* dlgDevice.c in Sources */, - 9670E16D0A5FA132009A73E0 /* dlgDisc.c in Sources */, 9670E16E0A5FA132009A73E0 /* dlgFileSelect.c in Sources */, 9670E16F0A5FA132009A73E0 /* dlgJoystick.c in Sources */, 9670E1700A5FA132009A73E0 /* dlgKeyboard.c in Sources */, 9670E1710A5FA132009A73E0 /* dlgMain.c in Sources */, 9670E1720A5FA132009A73E0 /* dlgMemory.c in Sources */, - 9670E1730A5FA132009A73E0 /* dlgNewDisc.c in Sources */, 9670E1740A5FA132009A73E0 /* dlgScreen.c in Sources */, 9670E1750A5FA132009A73E0 /* dlgSound.c in Sources */, 9670E1760A5FA132009A73E0 /* dlgSystem.c in Sources */, @@ -829,7 +932,6 @@ 9670E19E0A5FA132009A73E0 /* cpudefs.c in Sources */, 9670E19F0A5FA132009A73E0 /* cpustbl.c in Sources */, 9670E1A00A5FA132009A73E0 /* ioMem.c in Sources */, - 9670E1A10A5FA132009A73E0 /* ioMemTables.c in Sources */, 9670E1A20A5FA132009A73E0 /* log.c in Sources */, 9670E1A30A5FA132009A73E0 /* dmaSnd.c in Sources */, 9670E1A40A5FA132009A73E0 /* cycles.c in Sources */, @@ -839,6 +941,22 @@ 9670E1A80A5FA132009A73E0 /* AlertHooks.m in Sources */, 9670E1A90A5FA132009A73E0 /* dlgRom.c in Sources */, 9670E1AA0A5FA132009A73E0 /* options.c in Sources */, + 969191280AA205A80008B3A0 /* scandir.c in Sources */, + 961322FC0B5BD0B800007C3E /* dsp_cpu.c in Sources */, + 961322FE0B5BD0B800007C3E /* dsp_disasm.c in Sources */, + 961323000B5BD0B800007C3E /* dsp.c in Sources */, + 961323020B5BD0B800007C3E /* hostscreen.c in Sources */, + 961323050B5BD0B800007C3E /* videl.c in Sources */, + 9613230C0B5BD14B00007C3E /* ioMemTabFalcon.c in Sources */, + 9613230D0B5BD14B00007C3E /* ioMemTabST.c in Sources */, + 9613230E0B5BD14B00007C3E /* ioMemTabSTE.c in Sources */, + 9613230F0B5BD14B00007C3E /* ioMemTabTT.c in Sources */, + 961323300B5BD66600007C3E /* ide.c in Sources */, + 96635B770BF86FDF00518B3B /* nvram.c in Sources */, + 96B15D5A0D836FC0000326A2 /* paths.c in Sources */, + 96B15D5B0D836FC0000326A2 /* trace.c in Sources */, + 968B50F00D83704D00C21920 /* dlgDisk.c in Sources */, + 968B50F10D83704D00C21920 /* dlgNewDisk.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -873,13 +991,13 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", ALERT_HOOKS, ); - GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "DATADIR=\\\".\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "BIN2DATADIR=\\\".\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "CONFDIR=\\\".\\\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( @@ -946,8 +1064,8 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; + GCC_OPTIMIZATION_LEVEL = 2; + OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = "";