--- hatari/Hatari.xcodeproj/project.pbxproj 2019/04/01 07:14:29 1.1.1.3 +++ hatari/Hatari.xcodeproj/project.pbxproj 2019/04/09 08:46:58 1.1.1.5 @@ -17,7 +17,6 @@ 4EE4B6090DD8E15C00DF27A2 /* str.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EE4B6060DD8E15C00DF27A2 /* str.h */; }; 961322D80B5BCDB900007C3E /* config-default.h in Headers */ = {isa = PBXBuildFile; fileRef = 961322D30B5BCDB900007C3E /* config-default.h */; }; 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 */; }; @@ -186,15 +185,21 @@ 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 */; }; + 96A259050F8E4AAC007F5FD1 /* dlgFloppy.c in Sources */ = {isa = PBXBuildFile; fileRef = 96A259030F8E4AAC007F5FD1 /* dlgFloppy.c */; }; + 96A259060F8E4AAC007F5FD1 /* dlgHardDisk.c in Sources */ = {isa = PBXBuildFile; fileRef = 96A259040F8E4AAC007F5FD1 /* dlgHardDisk.c */; }; 96B15D550D836F8F000326A2 /* paths.h in Headers */ = {isa = PBXBuildFile; fileRef = 96B15D540D836F8F000326A2 /* paths.h */; }; 96B15D5A0D836FC0000326A2 /* paths.c in Sources */ = {isa = PBXBuildFile; fileRef = 96B15D580D836FC0000326A2 /* paths.c */; }; + E916E10A0EE4995200F42ED2 /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = E916E1090EE4995200F42ED2 /* utils.c */; }; + E916E10D0EE4997600F42ED2 /* dsp_core.c in Sources */ = {isa = PBXBuildFile; fileRef = E916E10B0EE4997600F42ED2 /* dsp_core.c */; }; + E916E10E0EE4997600F42ED2 /* dsp_core.h in Headers */ = {isa = PBXBuildFile; fileRef = E916E10C0EE4997600F42ED2 /* dsp_core.h */; }; E99613BA0E6DC6900047F6A0 /* statusbar.c in Sources */ = {isa = PBXBuildFile; fileRef = E99613B90E6DC6900047F6A0 /* statusbar.c */; }; E99613BD0E6DC6C50047F6A0 /* statusbar.h in Headers */ = {isa = PBXBuildFile; fileRef = E99613BB0E6DC6C50047F6A0 /* statusbar.h */; }; E99613BE0E6DC6C50047F6A0 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = E99613BC0E6DC6C50047F6A0 /* utils.h */; }; + E9D5DE560FF5892600ACEFF5 /* breakcond.h in Headers */ = {isa = PBXBuildFile; fileRef = E9D5DE550FF5892600ACEFF5 /* breakcond.h */; }; + E9D5DE580FF5894E00ACEFF5 /* breakcond.c in Sources */ = {isa = PBXBuildFile; fileRef = E9D5DE570FF5894E00ACEFF5 /* breakcond.c */; }; E9D75D5A0E8C1BB1000E76DE /* ym2149_fixed_vol.h in Headers */ = {isa = PBXBuildFile; fileRef = E9D75D590E8C1BB1000E76DE /* ym2149_fixed_vol.h */; }; /* End PBXBuildFile section */ @@ -252,7 +257,6 @@ 4EE4B6060DD8E15C00DF27A2 /* str.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = str.h; sourceTree = ""; }; 961322D30B5BCDB900007C3E /* config-default.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-default.h"; 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 = ""; }; @@ -278,13 +282,14 @@ 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 = ""; }; + 96A259030F8E4AAC007F5FD1 /* dlgFloppy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlgFloppy.c; sourceTree = ""; }; + 96A259040F8E4AAC007F5FD1 /* dlgHardDisk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlgHardDisk.c; sourceTree = ""; }; 96B15D540D836F8F000326A2 /* paths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paths.h; sourceTree = ""; }; 96B15D580D836FC0000326A2 /* paths.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = paths.c; path = src/paths.c; sourceTree = ""; }; 96BEBB3F0A567AC0007ADA48 /* AlertHooks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlertHooks.h; sourceTree = ""; }; @@ -296,6 +301,9 @@ 96D632670A4E9B9D00FBFA27 /* SDLMain.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = SDLMain.nib; sourceTree = ""; }; 96ECC69309B9907A00C5C54F /* CreateFloppyController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateFloppyController.h; sourceTree = ""; }; 96ECC69409B9907A00C5C54F /* CreateFloppyController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CreateFloppyController.m; sourceTree = ""; }; + E916E1090EE4995200F42ED2 /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = utils.c; path = src/utils.c; sourceTree = SOURCE_ROOT; }; + E916E10B0EE4997600F42ED2 /* dsp_core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsp_core.c; path = src/falcon/dsp_core.c; sourceTree = SOURCE_ROOT; }; + E916E10C0EE4997600F42ED2 /* dsp_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsp_core.h; path = src/falcon/dsp_core.h; sourceTree = SOURCE_ROOT; }; E9283E7307512EA200DA6B24 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = audio.c; path = src/audio.c; sourceTree = ""; }; E9283E7407512EA200DA6B24 /* bios.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = bios.c; path = src/bios.c; sourceTree = ""; }; E9283E7507512EA200DA6B24 /* blitter.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = blitter.c; path = src/blitter.c; sourceTree = ""; }; @@ -431,6 +439,8 @@ E9987A66075134AA007DC37B /* cpuemu.c */ = {isa = PBXFileReference; fileEncoding = 30; includeInIndex = 0; lastKnownFileType = sourcecode.c.c; path = cpuemu.c; sourceTree = ""; }; E9987A7B075135D6007DC37B /* cpudefs.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = cpudefs.c; sourceTree = ""; }; E9987A7C075135D6007DC37B /* cpustbl.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = cpustbl.c; sourceTree = ""; }; + E9D5DE550FF5892600ACEFF5 /* breakcond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = breakcond.h; path = src/includes/breakcond.h; sourceTree = SOURCE_ROOT; }; + E9D5DE570FF5894E00ACEFF5 /* breakcond.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = breakcond.c; path = src/breakcond.c; sourceTree = SOURCE_ROOT; }; E9D75D590E8C1BB1000E76DE /* ym2149_fixed_vol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ym2149_fixed_vol.h; path = src/includes/ym2149_fixed_vol.h; sourceTree = SOURCE_ROOT; }; F5A47A9D01A0482F01D3D55B /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = ""; }; F5A47A9E01A0483001D3D55B /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = ""; }; @@ -496,6 +506,7 @@ E9283E7307512EA200DA6B24 /* audio.c */, E9283E7407512EA200DA6B24 /* bios.c */, E9283E7507512EA200DA6B24 /* blitter.c */, + E9D5DE570FF5894E00ACEFF5 /* breakcond.c */, E9283E7707512EA200DA6B24 /* cart.c */, E9283E7607512EA200DA6B24 /* cart_asm.s */, 4EE4B5E80DD8E0DD00DF27A2 /* cartData.c */, @@ -555,6 +566,7 @@ E9283EEC07512EA200DA6B24 /* tos.c */, E9283EED07512EA200DA6B24 /* uae-cpu */, E9283F0107512EA200DA6B24 /* unzip.c */, + E916E1090EE4995200F42ED2 /* utils.c */, E9283F0207512EA200DA6B24 /* vdi.c */, E9283F0307512EA200DA6B24 /* video.c */, E9283F0407512EA200DA6B24 /* wavFormat.c */, @@ -631,9 +643,10 @@ E90ED0570ED8508200EB6257 /* falcon */ = { isa = PBXGroup; children = ( - 961322EF0B5BD0B800007C3E /* araglue.h */, 961322F40B5BD0B800007C3E /* dsp.c */, 961322F50B5BD0B800007C3E /* dsp.h */, + E916E10B0EE4997600F42ED2 /* dsp_core.c */, + E916E10C0EE4997600F42ED2 /* dsp_core.h */, 961322F00B5BD0B800007C3E /* dsp_cpu.c */, 961322F10B5BD0B800007C3E /* dsp_cpu.h */, 961322F20B5BD0B800007C3E /* dsp_disasm.c */, @@ -651,7 +664,8 @@ E9283E8507512EA200DA6B24 /* gui-sdl */ = { isa = PBXGroup; children = ( - 968B50EE0D83704D00C21920 /* dlgDisk.c */, + 96A259030F8E4AAC007F5FD1 /* dlgFloppy.c */, + 96A259040F8E4AAC007F5FD1 /* dlgHardDisk.c */, 968B50EF0D83704D00C21920 /* dlgNewDisk.c */, 96CD27820A58443F008DE57F /* dlgRom.c */, E9283E8707512EA200DA6B24 /* dlgAbout.c */, @@ -679,6 +693,7 @@ E9283E9E07512EA200DA6B24 /* audio.h */, E9283E9F07512EA200DA6B24 /* bios.h */, E9283EA007512EA200DA6B24 /* blitter.h */, + E9D5DE550FF5892600ACEFF5 /* breakcond.h */, E9283EA107512EA200DA6B24 /* cart.h */, E9283EA207512EA200DA6B24 /* cfgopts.h */, 4EE4B6040DD8E15C00DF27A2 /* change.h */, @@ -849,7 +864,6 @@ 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 */, @@ -866,6 +880,8 @@ E99613BD0E6DC6C50047F6A0 /* statusbar.h in Headers */, E99613BE0E6DC6C50047F6A0 /* utils.h in Headers */, E9D75D5A0E8C1BB1000E76DE /* ym2149_fixed_vol.h in Headers */, + E916E10E0EE4997600F42ED2 /* dsp_core.h in Headers */, + E9D5DE560FF5892600ACEFF5 /* breakcond.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1035,12 +1051,16 @@ 961323300B5BD66600007C3E /* ide.c in Sources */, 96635B770BF86FDF00518B3B /* nvram.c in Sources */, 96B15D5A0D836FC0000326A2 /* paths.c in Sources */, - 968B50F00D83704D00C21920 /* dlgDisk.c in Sources */, 968B50F10D83704D00C21920 /* dlgNewDisk.c in Sources */, 4EE4B5ED0DD8E0DD00DF27A2 /* change.c in Sources */, 4EE4B5EE0DD8E0DD00DF27A2 /* control.c in Sources */, 4EE4B5EF0DD8E0DD00DF27A2 /* str.c in Sources */, E99613BA0E6DC6900047F6A0 /* statusbar.c in Sources */, + E916E10A0EE4995200F42ED2 /* utils.c in Sources */, + E916E10D0EE4997600F42ED2 /* dsp_core.c in Sources */, + 96A259050F8E4AAC007F5FD1 /* dlgFloppy.c in Sources */, + 96A259060F8E4AAC007F5FD1 /* dlgHardDisk.c in Sources */, + E9D5DE580FF5894E00ACEFF5 /* breakcond.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1081,7 +1101,7 @@ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", ALERT_HOOKS, ); - GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "BIN2DATADIR=\\\".\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "BIN2DATADIR=\\\"../..\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "CONFDIR=\\\".\\\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( @@ -1116,8 +1136,9 @@ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", ALERT_HOOKS, + "ENABLE_DSP_EMU=1", ); - 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 = (