6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-01-23 01:16:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1662 from TomHarte/XcodeUpdates

Browse Source 
Allow Xcode to update project; resolve relevant build warnings.
This commit is contained in:
Thomas Harte
2025-12-11 20:45:03 -05:00
committed by GitHub
parent 21b7b95bec a0b69e14b7
commit c1a8df8dee
8 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InstructionSets/M50740/Decoder.cpp
View File

@@ -258,7 +258,7 @@ std::pair<int, InstructionSet::M50740::Instruction> Decoder::decode(const uint8_
const int bytes_to_consume = std::min(int(end - source), outstanding_bytes);
consumed_ += bytes_to_consume;
source += bytes_to_consume;
/* source += bytes_to_consume; */
operand_bytes_ += bytes_to_consume;
if(operand_size_ == operand_bytes_) {

2
Machines/Enterprise/Enterprise.cpp
View File

@@ -642,7 +642,7 @@ private:
/// @returns A pointer to the start of the RAM segment representing @c page if any; otherwise @c nullptr.
uint8_t *ram_segment(const uint8_t page) {
if(page < MinRAMSlot) return nullptr;
return &ram_[(page - MinRAMSlot) << 14];
return &ram_[size_t((page - MinRAMSlot) << 14)];
}
struct ROMPage {

14
OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
View File

@@ -5712,7 +5712,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1630;
LastUpgradeCheck = 2610;
ORGANIZATIONNAME = "Thomas Harte";
TargetAttributes = {
4B055A691FAE763F0060FFFF = {
@@ -7256,6 +7256,7 @@
DEVELOPMENT_TEAM = DV3346VVUN;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
@@ -7277,6 +7278,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
@@ -7318,6 +7320,7 @@
DEVELOPMENT_TEAM = DV3346VVUN;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -7331,6 +7334,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -7357,7 +7361,11 @@
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
ENABLE_APP_SANDBOX = YES;
ENABLE_FILE_ACCESS_PICTURE_FOLDER = readwrite;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_RESOURCE_ACCESS_BLUETOOTH = YES;
ENABLE_RESOURCE_ACCESS_USB = YES;
ENABLE_USER_SELECTED_FILES = readwrite;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -7405,7 +7413,11 @@
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
ENABLE_APP_SANDBOX = YES;
ENABLE_FILE_ACCESS_PICTURE_FOLDER = readwrite;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_RESOURCE_ACCESS_BLUETOOTH = YES;
ENABLE_RESOURCE_ACCESS_USB = YES;
ENABLE_USER_SELECTED_FILES = readwrite;
GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;

2
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
LastUpgradeVersion = "2610"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"

2
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock SignalTests.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

13
OSBindings/Mac/Clock Signal/Clock Signal.entitlements
View File

@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.assets.pictures.read-write</key>
<true/>
<key>com.apple.security.device.bluetooth</key>
<true/>
<key>com.apple.security.device.usb</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
</dict>
<dict/>
</plist>

6
OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
View File

@@ -93,13 +93,15 @@ struct PermissionDelegate: public Storage::FileBundle::FileBundle::PermissionDel
// Ask the user for permission.
dispatch_sync(dispatch_get_main_queue(), ^{
NSOpenPanel *request = [NSOpenPanel openPanel];
request.prompt = @"Grant Permission";
request.message = @"Please Grant Permission For Full Folder Access";
request.prompt = NSLocalizedString(@"Grant Permission", @"");
request.message = NSLocalizedString(@"Please Grant Permission For Full Folder Access", @"");
request.canChooseFiles = NO;
request.allowsMultipleSelection = NO;
request.canChooseDirectories = YES;
[request setDirectoryURL:[url URLByDeletingLastPathComponent]];
// TODO: a nicer accessory view; NSTextField or the relevant equivalent
// with an attributed string might work.
request.accessoryView = [NSTextField labelWithString:[&] {
const auto key_file = bundle.key_file();