Skip to content

Commit 35160b4

Browse files
seclorumhialmar
seclorum
and
hialmar
authored
Master www merge (#196)
* local branch for www dev * emcmake cmake .. is now working * Readme file First push to origin * Menus are now working. Need to debug filerequestors. * Added a warning about the gfx_atmoskbd.psd which is quite big and useless for Oricutron. * Menus are starting to work even though there are still some memory problems from time to time. Also fixed Mac compilation of the SDL2 version which is WAY faster. * Fixing deprecation of NSAlertDefaultReturn in filereq_osx.m * The web version is now able to download .dsk and .tap files from the same directory on the webserver. Moreover these files are stored in the browser's IndexedDB so that you can save your modifications to the files. * Added a solution for people who do not have PHP on their website. Removed a few useless traces and work around bugs (audio not pausing) that cannot be solved (emscripten and/or SDL port bugs). * Updating the current version of Oricutron.js * Mistakenly overwrote the good oricutron.html file. Going back to the previous committed version. Thanks a lot to git for being able to correct my gitty blunders ;) * Persisting snapshot and tape saves to IDBFS. Ie you can now save snapshots and ort tapes in your browser storage. * You can now download tape, dsk or snapshot files to your computer. * Simplifying the code to be able to better debug. Added compile options to disable the Monitor, the Pravetz (partial) and the Oric1 (partial) hardwares. --------- Co-authored-by: Patrice Torguet <[email protected]> Co-authored-by: Patrice Torguet <[email protected]>
1 parent f1af4d1 commit 35160b4

32 files changed

+1246
-108
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,11 @@ else
329329
CFLAGS += -D__OPENGL_AVAILABLE__ -D__CBCOPY__ -D__CBPASTE__ $(shell $(SDL_LIB)-config --cflags)
330330
endif
331331
ifneq (,$(CROSS_LFLAGS))
332-
LFLAGS += $(CROSS_LFLAGS) -s
332+
LFLAGS += $(CROSS_LFLAGS)
333333
else
334-
LFLAGS += $(shell $(SDL_LIB)-config --libs) -s
334+
LFLAGS += $(shell $(SDL_LIB)-config --libs)
335335
endif
336-
LFLAGS += -lm -Wl,-framework,OpenGL -Wl,-framework,Cocoa
336+
LFLAGS += -lm -Wl,-framework,OpenGL -framework CoreFoundation -framework AppKit
337337
TARGET = $(TARGET_NAME)
338338
FILEREQ_OBJ =
339339
MSGBOX_OBJ =

‎XCode/Oricutron/Oricutron.xcodeproj/project.pbxproj

+61-4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
181F131918CA6378009690E0 /* msgbox_osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 181F131618CA6378009690E0 /* msgbox_osx.m */; };
4141
181F131B18CA63F0009690E0 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 181F131A18CA63F0009690E0 /* OpenGL.framework */; };
4242
181F131D18CA6505009690E0 /* SDL.framework in Resources */ = {isa = PBXBuildFile; fileRef = 181F131118CA6219009690E0 /* SDL.framework */; };
43+
1863CD96255BEA4300B1D09B /* oric_ch376_plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 1863CD92255BEA4300B1D09B /* oric_ch376_plugin.c */; };
44+
1863CD97255BEA4300B1D09B /* ch376.c in Sources */ = {isa = PBXBuildFile; fileRef = 1863CD95255BEA4300B1D09B /* ch376.c */; };
4345
18A21B171B5CD8EC00B1BF3F /* system_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 18A21B161B5CD8EC00B1BF3F /* system_sdl.c */; };
4446
18D270CA18D7346600467488 /* keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 18D270C818D7346600467488 /* keyboard.c */; };
4547
18DC24B119D010EA00C6BCBE /* 6551_com.c in Sources */ = {isa = PBXBuildFile; fileRef = 18DC24AE19D010EA00C6BCBE /* 6551_com.c */; };
@@ -65,7 +67,6 @@
6567
181F128A18CA616A009690E0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
6668
181F128D18CA616A009690E0 /* Oricutron-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Oricutron-Info.plist"; sourceTree = "<group>"; };
6769
181F128F18CA616A009690E0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
68-
181F129318CA616A009690E0 /* Oricutron-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Oricutron-Prefix.pch"; sourceTree = "<group>"; };
6970
181F129518CA616A009690E0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
7071
181F129D18CA616A009690E0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
7172
181F12A318CA616A009690E0 /* OricutronTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OricutronTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -119,6 +120,11 @@
119120
181F131518CA6378009690E0 /* gui_osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = gui_osx.m; path = ../../../gui_osx.m; sourceTree = "<group>"; };
120121
181F131618CA6378009690E0 /* msgbox_osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = msgbox_osx.m; path = ../../../msgbox_osx.m; sourceTree = "<group>"; };
121122
181F131A18CA63F0009690E0 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = ../../../../../../../System/Library/Frameworks/OpenGL.framework; sourceTree = "<group>"; };
123+
1863CD8B255BE39500B1D09B /* Oricutron-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Oricutron-Prefix.pch"; sourceTree = "<group>"; };
124+
1863CD92255BEA4300B1D09B /* oric_ch376_plugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = oric_ch376_plugin.c; path = ../../../plugins/ch376/oric_ch376_plugin.c; sourceTree = "<group>"; };
125+
1863CD93255BEA4300B1D09B /* ch376.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ch376.h; path = ../../../plugins/ch376/ch376.h; sourceTree = "<group>"; };
126+
1863CD94255BEA4300B1D09B /* oric_ch376_plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oric_ch376_plugin.h; path = ../../../plugins/ch376/oric_ch376_plugin.h; sourceTree = "<group>"; };
127+
1863CD95255BEA4300B1D09B /* ch376.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ch376.c; path = ../../../plugins/ch376/ch376.c; sourceTree = "<group>"; };
122128
18A21B161B5CD8EC00B1BF3F /* system_sdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_sdl.c; path = ../../../system_sdl.c; sourceTree = "<group>"; };
123129
18A21B181B5CDAD100B1BF3F /* system_sdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system_sdl.h; path = ../../../system_sdl.h; sourceTree = "<group>"; };
124130
18D270C818D7346600467488 /* keyboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keyboard.c; path = ../../../keyboard.c; sourceTree = "<group>"; };
@@ -194,6 +200,10 @@
194200
181F128B18CA616A009690E0 /* Oricutron */ = {
195201
isa = PBXGroup;
196202
children = (
203+
1863CD95255BEA4300B1D09B /* ch376.c */,
204+
1863CD93255BEA4300B1D09B /* ch376.h */,
205+
1863CD92255BEA4300B1D09B /* oric_ch376_plugin.c */,
206+
1863CD94255BEA4300B1D09B /* oric_ch376_plugin.h */,
197207
18A21B181B5CDAD100B1BF3F /* system_sdl.h */,
198208
18A21B161B5CD8EC00B1BF3F /* system_sdl.c */,
199209
18D270C818D7346600467488 /* keyboard.c */,
@@ -259,8 +269,8 @@
259269
children = (
260270
181F128D18CA616A009690E0 /* Oricutron-Info.plist */,
261271
181F128E18CA616A009690E0 /* InfoPlist.strings */,
262-
181F129318CA616A009690E0 /* Oricutron-Prefix.pch */,
263272
181F129418CA616A009690E0 /* Credits.rtf */,
273+
1863CD8B255BE39500B1D09B /* Oricutron-Prefix.pch */,
264274
);
265275
name = "Supporting Files";
266276
sourceTree = "<group>";
@@ -309,7 +319,7 @@
309319
181F127A18CA616A009690E0 /* Project object */ = {
310320
isa = PBXProject;
311321
attributes = {
312-
LastUpgradeCheck = 0500;
322+
LastUpgradeCheck = 1210;
313323
ORGANIZATIONNAME = "Peter Gordon";
314324
TargetAttributes = {
315325
181F12A218CA616A009690E0 = {
@@ -319,7 +329,7 @@
319329
};
320330
buildConfigurationList = 181F127D18CA616A009690E0 /* Build configuration list for PBXProject "Oricutron" */;
321331
compatibilityVersion = "Xcode 3.2";
322-
developmentRegion = English;
332+
developmentRegion = en;
323333
hasScannedForEncodings = 0;
324334
knownRegions = (
325335
en,
@@ -377,6 +387,7 @@
377387
181F130A18CA61C6009690E0 /* tape.c in Sources */,
378388
18DC24B219D010EA00C6BCBE /* 6551_loopback.c in Sources */,
379389
181F12EE18CA61C6009690E0 /* 6502.c in Sources */,
390+
1863CD96255BEA4300B1D09B /* oric_ch376_plugin.c in Sources */,
380391
18DC24B119D010EA00C6BCBE /* 6551_com.c in Sources */,
381392
181F131918CA6378009690E0 /* msgbox_osx.m in Sources */,
382393
181F12F118CA61C6009690E0 /* avi.c in Sources */,
@@ -386,6 +397,7 @@
386397
181F131818CA6378009690E0 /* gui_osx.m in Sources */,
387398
181F130918CA61C6009690E0 /* snapshot.c in Sources */,
388399
18D270CA18D7346600467488 /* keyboard.c in Sources */,
400+
1863CD97255BEA4300B1D09B /* ch376.c in Sources */,
389401
181F12F318CA61C6009690E0 /* disk.c in Sources */,
390402
181F12F018CA61C6009690E0 /* 8912.c in Sources */,
391403
181F12FB18CA61C6009690E0 /* gui.c in Sources */,
@@ -435,21 +447,37 @@
435447
isa = XCBuildConfiguration;
436448
buildSettings = {
437449
ALWAYS_SEARCH_USER_PATHS = NO;
450+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
438451
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
439452
CLANG_CXX_LIBRARY = "libc++";
440453
CLANG_ENABLE_OBJC_ARC = YES;
454+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
441455
CLANG_WARN_BOOL_CONVERSION = YES;
456+
CLANG_WARN_COMMA = YES;
442457
CLANG_WARN_CONSTANT_CONVERSION = YES;
458+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
443459
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
444460
CLANG_WARN_EMPTY_BODY = YES;
445461
CLANG_WARN_ENUM_CONVERSION = YES;
462+
CLANG_WARN_INFINITE_RECURSION = YES;
446463
CLANG_WARN_INT_CONVERSION = YES;
464+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
465+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
466+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
447467
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
468+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
469+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
470+
CLANG_WARN_STRICT_PROTOTYPES = YES;
471+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
472+
CLANG_WARN_UNREACHABLE_CODE = YES;
448473
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
449474
COPY_PHASE_STRIP = NO;
475+
ENABLE_STRICT_OBJC_MSGSEND = YES;
476+
ENABLE_TESTABILITY = YES;
450477
GCC_C_LANGUAGE_STANDARD = gnu99;
451478
GCC_DYNAMIC_NO_PIC = NO;
452479
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
480+
GCC_NO_COMMON_BLOCKS = YES;
453481
GCC_OPTIMIZATION_LEVEL = 0;
454482
GCC_PREPROCESSOR_DEFINITIONS = (
455483
"DEBUG=1",
@@ -464,6 +492,7 @@
464492
GCC_WARN_UNUSED_VARIABLE = YES;
465493
MACOSX_DEPLOYMENT_TARGET = 10.9;
466494
ONLY_ACTIVE_ARCH = YES;
495+
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
467496
SDKROOT = macosx;
468497
};
469498
name = Debug;
@@ -472,22 +501,37 @@
472501
isa = XCBuildConfiguration;
473502
buildSettings = {
474503
ALWAYS_SEARCH_USER_PATHS = NO;
504+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
475505
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
476506
CLANG_CXX_LIBRARY = "libc++";
477507
CLANG_ENABLE_OBJC_ARC = YES;
508+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
478509
CLANG_WARN_BOOL_CONVERSION = YES;
510+
CLANG_WARN_COMMA = YES;
479511
CLANG_WARN_CONSTANT_CONVERSION = YES;
512+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
480513
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
481514
CLANG_WARN_EMPTY_BODY = YES;
482515
CLANG_WARN_ENUM_CONVERSION = YES;
516+
CLANG_WARN_INFINITE_RECURSION = YES;
483517
CLANG_WARN_INT_CONVERSION = YES;
518+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
519+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
520+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
484521
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
522+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
523+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
524+
CLANG_WARN_STRICT_PROTOTYPES = YES;
525+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
526+
CLANG_WARN_UNREACHABLE_CODE = YES;
485527
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
486528
COPY_PHASE_STRIP = YES;
487529
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
488530
ENABLE_NS_ASSERTIONS = NO;
531+
ENABLE_STRICT_OBJC_MSGSEND = YES;
489532
GCC_C_LANGUAGE_STANDARD = gnu99;
490533
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
534+
GCC_NO_COMMON_BLOCKS = YES;
491535
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
492536
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
493537
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -496,6 +540,7 @@
496540
GCC_WARN_UNUSED_VARIABLE = YES;
497541
MACOSX_DEPLOYMENT_TARGET = 10.9;
498542
ONLY_ACTIVE_ARCH = YES;
543+
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
499544
SDKROOT = macosx;
500545
};
501546
name = Release;
@@ -505,13 +550,17 @@
505550
buildSettings = {
506551
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
507552
CLANG_ENABLE_OBJC_ARC = NO;
553+
CLANG_ENABLE_OBJC_WEAK = YES;
554+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
555+
CODE_SIGN_IDENTITY = "-";
508556
COMBINE_HIDPI_IMAGES = YES;
509557
FRAMEWORK_SEARCH_PATHS = (
510558
"$(inherited)",
511559
"$(LOCAL_LIBRARY_DIR)/Frameworks",
512560
);
513561
GCC_PRECOMPILE_PREFIX_HEADER = YES;
514562
GCC_PREFIX_HEADER = "Oricutron/Oricutron-Prefix.pch";
563+
HEADER_SEARCH_PATHS = /opt/X11/include;
515564
INFOPLIST_FILE = "Oricutron/Oricutron-Info.plist";
516565
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Resources/";
517566
OTHER_CFLAGS = "";
@@ -527,6 +576,7 @@
527576
"-D__OPENGL_AVAILABLE__",
528577
"-DSDL_MAJOR_VERSION=1",
529578
);
579+
PRODUCT_BUNDLE_IDENTIFIER = "uk.org.petergordon.${PRODUCT_NAME:rfc1034identifier}";
530580
PRODUCT_NAME = "$(TARGET_NAME)";
531581
WRAPPER_EXTENSION = app;
532582
};
@@ -537,13 +587,17 @@
537587
buildSettings = {
538588
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
539589
CLANG_ENABLE_OBJC_ARC = NO;
590+
CLANG_ENABLE_OBJC_WEAK = YES;
591+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
592+
CODE_SIGN_IDENTITY = "-";
540593
COMBINE_HIDPI_IMAGES = YES;
541594
FRAMEWORK_SEARCH_PATHS = (
542595
"$(inherited)",
543596
"$(LOCAL_LIBRARY_DIR)/Frameworks",
544597
);
545598
GCC_PRECOMPILE_PREFIX_HEADER = YES;
546599
GCC_PREFIX_HEADER = "Oricutron/Oricutron-Prefix.pch";
600+
HEADER_SEARCH_PATHS = /opt/X11/include;
547601
INFOPLIST_FILE = "Oricutron/Oricutron-Info.plist";
548602
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Resources/";
549603
OTHER_CFLAGS = "";
@@ -559,6 +613,7 @@
559613
"-DBACKEND_COM",
560614
"-DBACKEND_MODEM",
561615
);
616+
PRODUCT_BUNDLE_IDENTIFIER = "uk.org.petergordon.${PRODUCT_NAME:rfc1034identifier}";
562617
PRODUCT_NAME = "$(TARGET_NAME)";
563618
WRAPPER_EXTENSION = app;
564619
};
@@ -580,6 +635,7 @@
580635
"$(inherited)",
581636
);
582637
INFOPLIST_FILE = "OricutronTests/OricutronTests-Info.plist";
638+
PRODUCT_BUNDLE_IDENTIFIER = "uk.org.petergordon.${PRODUCT_NAME:rfc1034identifier}";
583639
PRODUCT_NAME = "$(TARGET_NAME)";
584640
TEST_HOST = "$(BUNDLE_LOADER)";
585641
WRAPPER_EXTENSION = xctest;
@@ -598,6 +654,7 @@
598654
GCC_PRECOMPILE_PREFIX_HEADER = YES;
599655
GCC_PREFIX_HEADER = "Oricutron/Oricutron-Prefix.pch";
600656
INFOPLIST_FILE = "OricutronTests/OricutronTests-Info.plist";
657+
PRODUCT_BUNDLE_IDENTIFIER = "uk.org.petergordon.${PRODUCT_NAME:rfc1034identifier}";
601658
PRODUCT_NAME = "$(TARGET_NAME)";
602659
TEST_HOST = "$(BUNDLE_LOADER)";
603660
WRAPPER_EXTENSION = xctest;

‎XCode/Oricutron/Oricutron.xcodeproj/project.xcworkspace/xcuserdata/torguet.xcuserdatad/UserInterfaceState.xcuserstate

68.6 KB
Binary file not shown.

‎XCode/Oricutron/Oricutron.xcodeproj/xcuserdata/torguet.xcuserdatad/xcschemes/Oricutron.xcscheme

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0500"
3+
LastUpgradeVersion = "1210"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,19 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "181F128118CA616A009690E0"
34+
BuildableName = "Oricutron.app"
35+
BlueprintName = "Oricutron"
36+
ReferencedContainer = "container:Oricutron.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,26 +48,19 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "181F128118CA616A009690E0"
46-
BuildableName = "Oricutron.app"
47-
BlueprintName = "Oricutron"
48-
ReferencedContainer = "container:Oricutron.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
5151
</TestAction>
5252
<LaunchAction
53+
buildConfiguration = "Release"
5354
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5455
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5556
launchStyle = "0"
5657
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Release"
5858
ignoresPersistentStateOnLaunch = "NO"
5959
debugDocumentVersioning = "NO"
60+
debugServiceExtension = "internal"
6061
allowLocationSimulation = "YES">
61-
<BuildableProductRunnable>
62+
<BuildableProductRunnable
63+
runnableDebuggingMode = "0">
6264
<BuildableReference
6365
BuildableIdentifier = "primary"
6466
BlueprintIdentifier = "181F128118CA616A009690E0"
@@ -67,16 +69,15 @@
6769
ReferencedContainer = "container:Oricutron.xcodeproj">
6870
</BuildableReference>
6971
</BuildableProductRunnable>
70-
<AdditionalOptions>
71-
</AdditionalOptions>
7272
</LaunchAction>
7373
<ProfileAction
74+
buildConfiguration = "Release"
7475
shouldUseLaunchSchemeArgsEnv = "YES"
7576
savedToolIdentifier = ""
7677
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7878
debugDocumentVersioning = "YES">
79-
<BuildableProductRunnable>
79+
<BuildableProductRunnable
80+
runnableDebuggingMode = "0">
8081
<BuildableReference
8182
BuildableIdentifier = "primary"
8283
BlueprintIdentifier = "181F128118CA616A009690E0"

‎XCode/Oricutron/Oricutron/Oricutron-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>uk.org.petergordon.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎XCode/Oricutron/Oricutron/Oricutron-Prefix.pch

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// Oricutron-Prefix.pch
3+
// Oricutron
4+
//
5+
// Created by Patrice Torguet on 11/11/2020.
6+
// Copyright © 2020 Peter Gordon. All rights reserved.
7+
//
8+
9+
#ifndef Oricutron_Prefix_pch
10+
#define Oricutron_Prefix_pch
11+
12+
// Include any system framework and library headers here that should be included in all compilation units.
13+
// You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
14+
15+
#endif /* Oricutron_Prefix_pch */

‎XCode/Oricutron/OricutronTests/OricutronTests-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>uk.org.petergordon.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

0 commit comments

Comments
 (0)