diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj index 8eb0925c..bdcf70b1 100644 --- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj +++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj @@ -11,11 +11,6 @@ 752F26FB1F240E69001032B4 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 752F26FA1F240E69001032B4 /* IOKit.framework */; }; 752F27011F242BAF001032B4 /* prefs_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 752F27001F242BAF001032B4 /* prefs_sdl.cpp */; }; 752F27031F242F51001032B4 /* xpram_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 752F27021F242F51001032B4 /* xpram_sdl.cpp */; }; - 753252E91F535A0C0024025B /* build68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 753252E51F5359040024025B /* build68k.c */; }; - 753252EE1F535DD10024025B /* defs68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 753252ED1F535DD10024025B /* defs68k.c */; }; - 753253021F535F210024025B /* gencpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 753253011F535F210024025B /* gencpu.c */; }; - 753253151F5363400024025B /* defs68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 753252ED1F535DD10024025B /* defs68k.c */; }; - 753253201F53650F0024025B /* readcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E0CE1F23B25A006B2DF2 /* readcpu.cpp */; }; 753253311F5368370024025B /* cpuemu_nf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7532532C1F5368370024025B /* cpuemu_nf.cpp */; }; 753253321F5368370024025B /* cpuemu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7532532D1F5368370024025B /* cpuemu.cpp */; }; 753253331F5368370024025B /* cpustbl_nf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7532532E1F5368370024025B /* cpustbl_nf.cpp */; }; @@ -99,39 +94,9 @@ E4555EED2354434B00139FCE /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 7539E00A1F23B25A006B2DF2 /* Credits.html */; }; E490334E20D3A5890012DD5F /* clip_macosx64.mm in Sources */ = {isa = PBXBuildFile; fileRef = E490334D20D3A5890012DD5F /* clip_macosx64.mm */; }; E4D8245323543D9800849B78 /* fpu_ieee.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4D8245223543D9700849B78 /* fpu_ieee.cpp */; }; + E4EE777523D7D71400BAE63A /* defs68k.c in Sources */ = {isa = PBXBuildFile; fileRef = E417913123D7D67C0009AD63 /* defs68k.c */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7532530B1F53611F0024025B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7539DFAA1F23B17E006B2DF2 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 753252D91F5358D30024025B; - remoteInfo = build68k; - }; - 7532531A1F5364030024025B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7539DFAA1F23B17E006B2DF2 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 753252F21F535E1E0024025B; - remoteInfo = gencpu; - }; - 7532531C1F53640B0024025B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7539DFAA1F23B17E006B2DF2 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 753253071F5360E30024025B; - remoteInfo = RunBuild68k; - }; - 7532531E1F5364170024025B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7539DFAA1F23B17E006B2DF2 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 753253161F5363D20024025B; - remoteInfo = RunGencpu; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 752F26F31F240140001032B4 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -144,24 +109,6 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - 753252D81F5358D30024025B /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; - 753252F11F535E1E0024025B /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -169,10 +116,7 @@ 752F26FA1F240E69001032B4 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 752F27001F242BAF001032B4 /* prefs_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = prefs_sdl.cpp; sourceTree = ""; }; 752F27021F242F51001032B4 /* xpram_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xpram_sdl.cpp; sourceTree = ""; }; - 753252DA1F5358D30024025B /* build68k */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = build68k; sourceTree = BUILT_PRODUCTS_DIR; }; 753252E51F5359040024025B /* build68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = build68k.c; sourceTree = ""; }; - 753252ED1F535DD10024025B /* defs68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = defs68k.c; path = build68k_output/defs68k.c; sourceTree = BUILT_PRODUCTS_DIR; }; - 753252F31F535E1E0024025B /* gencpu */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gencpu; sourceTree = BUILT_PRODUCTS_DIR; }; 753253011F535F210024025B /* gencpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gencpu.c; sourceTree = ""; }; 7532532C1F5368370024025B /* cpuemu_nf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cpuemu_nf.cpp; path = gencpu_output/cpuemu_nf.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; 7532532D1F5368370024025B /* cpuemu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cpuemu.cpp; path = gencpu_output/cpuemu.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -376,25 +320,12 @@ E413D93720D2613500E437D8 /* ether_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ether_unix.cpp; sourceTree = ""; }; E413D93920D2614E00E437D8 /* extfs_macosx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extfs_macosx.cpp; sourceTree = ""; }; E4150D1320D559800077C51A /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; + E417913123D7D67C0009AD63 /* defs68k.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = defs68k.c; path = gencpu_output/defs68k.c; sourceTree = BUILT_PRODUCTS_DIR; }; E490334D20D3A5890012DD5F /* clip_macosx64.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = clip_macosx64.mm; sourceTree = ""; }; E4D8245223543D9700849B78 /* fpu_ieee.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fpu_ieee.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 753252D71F5358D30024025B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 753252F01F535E1E0024025B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 7539DFAF1F23B17E006B2DF2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -472,20 +403,11 @@ 753252FF1F535E5D0024025B /* generated src */ = { isa = PBXGroup; children = ( - 753253001F535E840024025B /* build68k output */, 7532532B1F53675E0024025B /* gencpu output */, ); name = "generated src"; sourceTree = ""; }; - 753253001F535E840024025B /* build68k output */ = { - isa = PBXGroup; - children = ( - 753252ED1F535DD10024025B /* defs68k.c */, - ); - name = "build68k output"; - sourceTree = ""; - }; 7532532B1F53675E0024025B /* gencpu output */ = { isa = PBXGroup; children = ( @@ -494,6 +416,7 @@ 7532532E1F5368370024025B /* cpustbl_nf.cpp */, 7532532F1F5368370024025B /* cpustbl.cpp */, 753253301F5368370024025B /* cputbl.h */, + E417913123D7D67C0009AD63 /* defs68k.c */, ); name = "gencpu output"; sourceTree = ""; @@ -513,8 +436,6 @@ isa = PBXGroup; children = ( 7539DFB21F23B17E006B2DF2 /* BasiliskII.app */, - 753252DA1F5358D30024025B /* build68k */, - 753252F31F535E1E0024025B /* gencpu */, ); name = Products; path = ../../../../../../../../Documents/Code/macemu/BasiliskII/src/MacOSX; @@ -790,75 +711,7 @@ }; /* End PBXGroup section */ -/* Begin PBXLegacyTarget section */ - 753253071F5360E30024025B /* run_build68k */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "$(ACTION)"; - buildConfigurationList = 753253081F5360E30024025B /* Build configuration list for PBXLegacyTarget "run_build68k" */; - buildPhases = ( - ); - buildToolPath = "$(PROJECT_DIR)/run_build68k_for_xcode.sh"; - buildWorkingDirectory = ""; - dependencies = ( - 7532530C1F53611F0024025B /* PBXTargetDependency */, - ); - name = run_build68k; - passBuildSettingsInEnvironment = 1; - productName = RunBuild68k; - }; - 753253161F5363D20024025B /* run_gencpu */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "$(ACTION)"; - buildConfigurationList = 753253171F5363D20024025B /* Build configuration list for PBXLegacyTarget "run_gencpu" */; - buildPhases = ( - ); - buildToolPath = "$(PROJECT_DIR)/run_gencpu_for_xcode.sh"; - buildWorkingDirectory = ""; - dependencies = ( - 7532531B1F5364030024025B /* PBXTargetDependency */, - ); - name = run_gencpu; - passBuildSettingsInEnvironment = 1; - productName = RunGencpu; - }; -/* End PBXLegacyTarget section */ - /* Begin PBXNativeTarget section */ - 753252D91F5358D30024025B /* build68k */ = { - isa = PBXNativeTarget; - buildConfigurationList = 753252E31F5358D30024025B /* Build configuration list for PBXNativeTarget "build68k" */; - buildPhases = ( - 753252D61F5358D30024025B /* Sources */, - 753252D71F5358D30024025B /* Frameworks */, - 753252D81F5358D30024025B /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = build68k; - productName = build68k; - productReference = 753252DA1F5358D30024025B /* build68k */; - productType = "com.apple.product-type.tool"; - }; - 753252F21F535E1E0024025B /* gencpu */ = { - isa = PBXNativeTarget; - buildConfigurationList = 753252F71F535E1E0024025B /* Build configuration list for PBXNativeTarget "gencpu" */; - buildPhases = ( - 753252EF1F535E1E0024025B /* Sources */, - 753252F01F535E1E0024025B /* Frameworks */, - 753252F11F535E1E0024025B /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 7532531D1F53640B0024025B /* PBXTargetDependency */, - ); - name = gencpu; - productName = gencpu; - productReference = 753252F31F535E1E0024025B /* gencpu */; - productType = "com.apple.product-type.tool"; - }; 7539DFB11F23B17E006B2DF2 /* BasiliskII */ = { isa = PBXNativeTarget; buildConfigurationList = 7539DFC61F23B17E006B2DF2 /* Build configuration list for PBXNativeTarget "BasiliskII" */; @@ -872,7 +725,6 @@ buildRules = ( ); dependencies = ( - 7532531F1F5364170024025B /* PBXTargetDependency */, ); name = BasiliskII; productName = BasiliskII; @@ -887,22 +739,6 @@ attributes = { LastUpgradeCheck = 0830; TargetAttributes = { - 753252D91F5358D30024025B = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; - }; - 753252F21F535E1E0024025B = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; - }; - 753253071F5360E30024025B = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; - }; - 753253161F5363D20024025B = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; - }; 7539DFB11F23B17E006B2DF2 = { CreatedOnToolsVersion = 8.3.3; ProvisioningStyle = Automatic; @@ -924,10 +760,6 @@ projectRoot = ""; targets = ( 7539DFB11F23B17E006B2DF2 /* BasiliskII */, - 753252D91F5358D30024025B /* build68k */, - 753252F21F535E1E0024025B /* gencpu */, - 753253071F5360E30024025B /* run_build68k */, - 753253161F5363D20024025B /* run_gencpu */, ); }; /* End PBXProject section */ @@ -954,36 +786,24 @@ ); name = "Run Script"; outputPaths = ( + $BUILT_PRODUCTS_DIR/gencpu_output/cpuemu.cpp, + $BUILT_PRODUCTS_DIR/gencpu_output/cpuemu_nf.cpp, + $BUILT_PRODUCTS_DIR/gencpu_output/cpustbl.cpp, + $BUILT_PRODUCTS_DIR/gencpu_output/cpustbl_nf.cpp, + $BUILT_PRODUCTS_DIR/gencpu_output/defs68k.c, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# ${PROJECT_DIR}/generate_cpu_srcs_for_xcode.sh"; + shellScript = "make -f Makefile.gencpu\n"; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 753252D61F5358D30024025B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 753252E91F535A0C0024025B /* build68k.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 753252EF1F535E1E0024025B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 753253021F535F210024025B /* gencpu.c in Sources */, - 753253201F53650F0024025B /* readcpu.cpp in Sources */, - 753253151F5363400024025B /* defs68k.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 7539DFAE1F23B17E006B2DF2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E4EE777523D7D71400BAE63A /* defs68k.c in Sources */, 7539E19E1F23B25A006B2DF2 /* rounding.cpp in Sources */, 7539E29D1F23C83F006B2DF2 /* sys_darwin.cpp in Sources */, 7539E1291F23B25A006B2DF2 /* video_blit.cpp in Sources */, @@ -994,7 +814,6 @@ E40CEEC620D7910E00BCB88D /* SDLMain.m in Sources */, 753253351F53688D0024025B /* readcpu.cpp in Sources */, 7539E1741F23B25A006B2DF2 /* audio_sdl.cpp in Sources */, - 753252EE1F535DD10024025B /* defs68k.c in Sources */, E413D93120D260BC00E437D8 /* ip_output.c in Sources */, 7539E1E21F23B25A006B2DF2 /* video.cpp in Sources */, 7539E18F1F23B25A006B2DF2 /* timer.cpp in Sources */, @@ -1070,29 +889,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 7532530C1F53611F0024025B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 753252D91F5358D30024025B /* build68k */; - targetProxy = 7532530B1F53611F0024025B /* PBXContainerItemProxy */; - }; - 7532531B1F5364030024025B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 753252F21F535E1E0024025B /* gencpu */; - targetProxy = 7532531A1F5364030024025B /* PBXContainerItemProxy */; - }; - 7532531D1F53640B0024025B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 753253071F5360E30024025B /* run_build68k */; - targetProxy = 7532531C1F53640B0024025B /* PBXContainerItemProxy */; - }; - 7532531F1F5364170024025B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 753253161F5363D20024025B /* run_gencpu */; - targetProxy = 7532531E1F5364170024025B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ 7539E00F1F23B25A006B2DF2 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -1105,70 +901,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 753252DE1F5358D30024025B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LIBRARY = "libc++"; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 753252DF1F5358D30024025B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LIBRARY = "libc++"; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 753252F81F535E1E0024025B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LIBRARY = "libc++"; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 753252F91F535E1E0024025B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LIBRARY = "libc++"; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 753253091F5360E30024025B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 7532530A1F5360E30024025B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 753253181F5363D20024025B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 753253191F5363D20024025B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 7539DFC41F23B17E006B2DF2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1384,42 +1116,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 753252E31F5358D30024025B /* Build configuration list for PBXNativeTarget "build68k" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 753252DE1F5358D30024025B /* Debug */, - 753252DF1F5358D30024025B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 753252F71F535E1E0024025B /* Build configuration list for PBXNativeTarget "gencpu" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 753252F81F535E1E0024025B /* Debug */, - 753252F91F535E1E0024025B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 753253081F5360E30024025B /* Build configuration list for PBXLegacyTarget "run_build68k" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 753253091F5360E30024025B /* Debug */, - 7532530A1F5360E30024025B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 753253171F5363D20024025B /* Build configuration list for PBXLegacyTarget "run_gencpu" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 753253181F5363D20024025B /* Debug */, - 753253191F5363D20024025B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 7539DFAD1F23B17E006B2DF2 /* Build configuration list for PBXProject "BasiliskII" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/BasiliskII/src/MacOSX/Makefile.gencpu b/BasiliskII/src/MacOSX/Makefile.gencpu new file mode 100644 index 00000000..2e2ec45e --- /dev/null +++ b/BasiliskII/src/MacOSX/Makefile.gencpu @@ -0,0 +1,27 @@ +SRC = $(PROJECT_DIR)/../uae_cpu +DST = $(BUILT_PRODUCTS_DIR)/gencpu_output +VPATH = $(SRC) +CFLAGS = -DUSE_XCODE=1 -I. -I../uae_cpu -I../UNIX +CXXFLAGS = -stdlib=libc++ $(CFLAGS) +OBJS = $(addprefix $(DST)/, defs68k.o gencpu.o readcpu.o) + +all: $(DST)/gencpu + cd $(DST); ./gencpu + +$(DST)/gencpu: $(OBJS) + $(CXX) $(CXXFLAGS) -o $@ $^ + +$(DST)/%.o: %.c + $(CC) $(CFLAGS) -o $@ -c $< + +$(DST)/%.o: %.cpp + $(CXX) $(CXXFLAGS) -o $@ -c $< + +$(DST)/defs68k.c: $(DST)/build68k + $< < $(SRC)/table68k > $@ + +$(DST)/build68k: $(SRC)/build68k.c + mkdir -p $(DST) + $(CC) $(CFLAGS) -o $@ $< + +clean:; rm -fr $(DST) diff --git a/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh b/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh deleted file mode 100755 index 3a34fc01..00000000 --- a/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -e - -# -# run_build68k_for_xcode.sh -# -# Generates files for 68k emulation, via UAE's virtual cpu, for use on Mac OS X hosts -# - -if [ ! "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then - echo "ERROR: $(basename $0) must be run from an Xcode 'External Build System' target" - exit 1 -fi - -# Log some debugging information -echo "1=$1" -echo "BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR" -echo "PROJECT_DIR=$PROJECT_DIR" - -# Perform actions, given the passed-in build step -case "$1" in - "clean") - echo "Cleaning build68k output(s)" - rm -rf "$BUILT_PRODUCTS_DIR/build68k_output" - ;; - "") - if [ ! -d "$BUILT_PRODUCTS_DIR" ]; then - echo "No built products directory" - exit 1 - fi - echo "Running build68k" - cd "$BUILT_PRODUCTS_DIR" - mkdir -p build68k_output - cd build68k_output - cat "$PROJECT_DIR/../uae_cpu/table68k" | "$BUILT_PRODUCTS_DIR/build68k" > "./defs68k.c" - ls -al - ;; -esac diff --git a/BasiliskII/src/MacOSX/run_gencomp_for_xcode.sh b/BasiliskII/src/MacOSX/run_gencomp_for_xcode.sh deleted file mode 100755 index 4e68a896..00000000 --- a/BasiliskII/src/MacOSX/run_gencomp_for_xcode.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -e - -# -# run_gencomp_for_xcode.sh -# -# Generates files for 68k emulation, via UAE's virtual cpu, for use on Mac OS X hosts -# - -if [ ! "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then - echo "ERROR: $(basename $0) must be run from an Xcode 'External Build System' target" - exit 1 -fi - -# Log some debugging information -echo "1=$1" -echo "BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR" -echo "PROJECT_DIR=$PROJECT_DIR" - -# Perform actions, given the passed-in build step -case "$1" in - "clean") - echo "Cleaning gencomp output(s)" - rm -rf "$BUILT_PRODUCTS_DIR/gencomp_output" - ;; - "") - if [ ! -d "$BUILT_PRODUCTS_DIR" ]; then - echo "No built products directory" - exit 1 - fi - echo "Running gencomp" - cd "$BUILT_PRODUCTS_DIR" - mkdir -p gencomp_output - cd gencomp_output - "$BUILT_PRODUCTS_DIR/gencomp" - ls -al - ;; -esac diff --git a/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh b/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh deleted file mode 100755 index e457b8fa..00000000 --- a/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -e - -# -# run_gemcpu_for_xcode.sh -# -# Generates files for 68k emulation, via UAE's virtual cpu, for use on Mac OS X hosts -# - -if [ ! "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then - echo "ERROR: $(basename $0) must be run from an Xcode 'External Build System' target" - exit 1 -fi - -# Log some debugging information -echo "1=$1" -echo "BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR" -echo "PROJECT_DIR=$PROJECT_DIR" - -# Perform actions, given the passed-in build step -case "$1" in - "clean") - echo "Cleaning gencpu output(s)" - rm -rf "$BUILT_PRODUCTS_DIR/gencpu_output" - ;; - "") - if [ ! -d "$BUILT_PRODUCTS_DIR" ]; then - echo "No built products directory" - exit 1 - fi - echo "Running gencpu" - cd "$BUILT_PRODUCTS_DIR" - mkdir -p gencpu_output - cd gencpu_output - "$BUILT_PRODUCTS_DIR/gencpu" - ls -al - ;; -esac