Skip to content

Commit 8a725aa

Browse files
elevenfiveelevenfive
authored
iOS & macOS fixes; Android dependency update (#10)
- Remove symlinks so that shared code can be navigated in XCode - Fix code signing for simulator running of iOS app - Update Android AGP 8.13.0 -> 8.13.1
1 parent fa6cf2a commit 8a725aa

File tree

7 files changed

+29
-68
lines changed

7 files changed

+29
-68
lines changed

‎android/gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
espressoCore = "3.7.0"
3-
gradle = "8.13.0"
3+
gradle = "8.13.1"
44
gradleVersionsPlugin = "0.53.0"
55
junit = "1.3.0"
66
kotlinGradlePlugin = "2.2.21"

‎ios/acidwarp-ios.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
501D30271E96C10000DE30A6 /* rolnfade.c in Sources */ = {isa = PBXBuildFile; fileRef = 501D30191E96C10000DE30A6 /* rolnfade.c */; };
1717
501D30281E96C10000DE30A6 /* warp_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 501D301A1E96C10000DE30A6 /* warp_text.c */; };
1818
501D30291E96C10000DE30A6 /* remote_overlay.c in Sources */ = {isa = PBXBuildFile; fileRef = 501D301B1E96C10000DE30A6 /* remote_overlay.c */; };
19-
501D302A1E96C10000DE30A7 /* remote.png in Resources */ = {isa = PBXBuildFile; fileRef = 501D301C1E96C10000DE30A6 /* remote.png */; };
2019
/* End PBXBuildFile section */
2120

2221
/* Begin PBXContainerItemProxy section */
@@ -57,7 +56,6 @@
5756
504807AE2E97632900B1C478 /* Exceptions for "acidwarp" folder in "acidwarp" target */ = {
5857
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
5958
membershipExceptions = (
60-
acidwarp,
6159
Info.plist,
6260
);
6361
target = 502A14FB2E70BBC000BA2A0F /* acidwarp */;
@@ -83,6 +81,12 @@
8381
path = acidwarpUITests;
8482
sourceTree = "<group>";
8583
};
84+
50A5FFD32EC28C3C00F0186E /* shared */ = {
85+
isa = PBXFileSystemSynchronizedRootGroup;
86+
name = shared;
87+
path = ../shared;
88+
sourceTree = SOURCE_ROOT;
89+
};
8690
/* End PBXFileSystemSynchronizedRootGroup section */
8791

8892
/* Begin PBXFrameworksBuildPhase section */
@@ -113,11 +117,11 @@
113117
502A14F32E70BBC000BA2A0F = {
114118
isa = PBXGroup;
115119
children = (
120+
50A5FFD32EC28C3C00F0186E /* shared */,
116121
502A14FE2E70BBC000BA2A0F /* acidwarp */,
117122
502A151C2E70BBC100BA2A0F /* acidwarpTests */,
118123
502A15262E70BBC100BA2A0F /* acidwarpUITests */,
119124
502A14FD2E70BBC000BA2A0F /* Products */,
120-
50B9AB9A2EC01E1000A028A5 /* Recovered References */,
121125
);
122126
sourceTree = "<group>";
123127
};
@@ -131,24 +135,6 @@
131135
name = Products;
132136
sourceTree = "<group>";
133137
};
134-
50B9AB9A2EC01E1000A028A5 /* Recovered References */ = {
135-
isa = PBXGroup;
136-
children = (
137-
501D30121E96C10000DE30A6 /* acidwarp.c */,
138-
501D30131E96C10000DE30A6 /* bit_map.c */,
139-
501D30141E96C10000DE30A6 /* display.c */,
140-
501D30151E96C10000DE30A6 /* draw.c */,
141-
501D30161E96C10000DE30A6 /* gen_img.c */,
142-
501D30171E96C10000DE30A6 /* img_float.c */,
143-
501D30181E96C10000DE30A6 /* palinit.c */,
144-
501D30191E96C10000DE30A6 /* rolnfade.c */,
145-
501D301A1E96C10000DE30A6 /* warp_text.c */,
146-
501D301B1E96C10000DE30A6 /* remote_overlay.c */,
147-
501D301C1E96C10000DE30A6 /* remote.png */,
148-
);
149-
name = "Recovered References";
150-
sourceTree = "<group>";
151-
};
152138
/* End PBXGroup section */
153139

154140
/* Begin PBXNativeTarget section */
@@ -170,6 +156,7 @@
170156
);
171157
fileSystemSynchronizedGroups = (
172158
502A14FE2E70BBC000BA2A0F /* acidwarp */,
159+
50A5FFD32EC28C3C00F0186E /* shared */,
173160
);
174161
name = acidwarp;
175162
packageProductDependencies = (
@@ -272,7 +259,6 @@
272259
isa = PBXResourcesBuildPhase;
273260
buildActionMask = 2147483647;
274261
files = (
275-
501D302A1E96C10000DE30A7 /* remote.png in Resources */,
276262
);
277263
runOnlyForDeploymentPostprocessing = 0;
278264
};
@@ -367,7 +353,7 @@
367353
);
368354
runOnlyForDeploymentPostprocessing = 0;
369355
shellPath = /bin/sh;
370-
shellScript = "set -e\nif [ \"$PLATFORM_NAME\" = \"iphonesimulator\" ]; then\n SDL3_FRAMEWORK_PATH=\"$SRCROOT/../SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework\"\n SDL3_IMAGE_FRAMEWORK_PATH=\"$SRCROOT/../SDL3_image.xcframework/ios-arm64_x86_64-simulator/SDL3_image.framework\"\nelse\n SDL3_FRAMEWORK_PATH=\"$SRCROOT/../SDL3.xcframework/ios-arm64/SDL3.framework\"\n SDL3_IMAGE_FRAMEWORK_PATH=\"$SRCROOT/../SDL3_image.xcframework/ios-arm64/SDL3_image.framework\"\nfi\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\ncp -R \"$SDL3_FRAMEWORK_PATH\" \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/\"\ncp -R \"$SDL3_IMAGE_FRAMEWORK_PATH\" \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/\"\nif [ \"$PLATFORM_NAME\" != \"iphonesimulator\" ]; then\n SIGNING_IDENTITY=\"${EXPANDED_CODE_SIGN_IDENTITY}\"\n if [ -z \"$SIGNING_IDENTITY\" ] || [ \"$SIGNING_IDENTITY\" = \"-\" ]; then\n SIGNING_IDENTITY=\"${CODE_SIGN_IDENTITY}\"\n fi\n if [ -n \"$SIGNING_IDENTITY\" ] && [ \"$SIGNING_IDENTITY\" != \"-\" ]; then\n codesign --force --sign \"$SIGNING_IDENTITY\" --timestamp=none \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDL3.framework\"\n codesign --force --sign \"$SIGNING_IDENTITY\" --timestamp=none \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDL3_image.framework\"\n fi\nfi\n";
356+
shellScript = "set -e\nif [ \"$PLATFORM_NAME\" = \"iphonesimulator\" ]; then\n SDL3_FRAMEWORK_PATH=\"$SRCROOT/../SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework\"\n SDL3_IMAGE_FRAMEWORK_PATH=\"$SRCROOT/../SDL3_image.xcframework/ios-arm64_x86_64-simulator/SDL3_image.framework\"\nelse\n SDL3_FRAMEWORK_PATH=\"$SRCROOT/../SDL3.xcframework/ios-arm64/SDL3.framework\"\n SDL3_IMAGE_FRAMEWORK_PATH=\"$SRCROOT/../SDL3_image.xcframework/ios-arm64/SDL3_image.framework\"\nfi\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\ncp -R \"$SDL3_FRAMEWORK_PATH\" \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/\"\ncp -R \"$SDL3_IMAGE_FRAMEWORK_PATH\" \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/\"\n\n# Sign frameworks for both device and simulator\nif [ \"$PLATFORM_NAME\" = \"iphonesimulator\" ]; then\n # Simulator: use ad-hoc signing\n codesign --force --sign - \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDL3.framework\"\n codesign --force --sign - \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDL3_image.framework\"\nelse\n # Device: use proper signing identity\n SIGNING_IDENTITY=\"${EXPANDED_CODE_SIGN_IDENTITY}\"\n if [ -z \"$SIGNING_IDENTITY\" ] || [ \"$SIGNING_IDENTITY\" = \"-\" ]; then\n SIGNING_IDENTITY=\"${CODE_SIGN_IDENTITY}\"\n fi\n if [ -n \"$SIGNING_IDENTITY\" ] && [ \"$SIGNING_IDENTITY\" != \"-\" ]; then\n codesign --force --sign \"$SIGNING_IDENTITY\" --timestamp=none \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDL3.framework\"\n codesign --force --sign \"$SIGNING_IDENTITY\" --timestamp=none \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDL3_image.framework\"\n fi\nfi\n";
371357
};
372358
/* End PBXShellScriptBuildPhase section */
373359

@@ -376,15 +362,6 @@
376362
isa = PBXSourcesBuildPhase;
377363
buildActionMask = 2147483647;
378364
files = (
379-
501D30201E96C10000DE30A6 /* acidwarp.c in Sources */,
380-
501D30211E96C10000DE30A6 /* bit_map.c in Sources */,
381-
501D30221E96C10000DE30A6 /* display.c in Sources */,
382-
501D30231E96C10000DE30A6 /* draw.c in Sources */,
383-
501D30241E96C10000DE30A6 /* gen_img.c in Sources */,
384-
501D30261E96C10000DE30A6 /* palinit.c in Sources */,
385-
501D30271E96C10000DE30A6 /* rolnfade.c in Sources */,
386-
501D30281E96C10000DE30A6 /* warp_text.c in Sources */,
387-
501D30291E96C10000DE30A6 /* remote_overlay.c in Sources */,
388365
);
389366
runOnlyForDeploymentPostprocessing = 0;
390367
};
@@ -576,7 +553,7 @@
576553
GENERATE_INFOPLIST_FILE = YES;
577554
HEADER_SEARCH_PATHS = (
578555
"$(inherited)",
579-
"$(PROJECT_DIR)/acidwarp/acidwarp",
556+
"$(SRCROOT)/../shared",
580557
"$(SRCROOT)/../SDL3.xcframework/ios-arm64/SDL3.framework/Headers",
581558
"$(SRCROOT)/../SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Headers",
582559
"$(SRCROOT)/../SDL3_image.xcframework/ios-arm64/SDL3_image.framework/Headers",
@@ -649,7 +626,7 @@
649626
GENERATE_INFOPLIST_FILE = YES;
650627
HEADER_SEARCH_PATHS = (
651628
"$(inherited)",
652-
"$(PROJECT_DIR)/acidwarp/acidwarp",
629+
"$(SRCROOT)/../shared",
653630
"$(SRCROOT)/../SDL3.xcframework/ios-arm64/SDL3.framework/Headers",
654631
"$(SRCROOT)/../SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Headers",
655632
"$(SRCROOT)/../SDL3_image.xcframework/ios-arm64/SDL3_image.framework/Headers",

‎ios/acidwarp/.DS_Store‎

-6 KB
Binary file not shown.

‎ios/acidwarp/acidwarp‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎macos/acidwarp-macos.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
501D30171E96C00000DE30A6 /* rolnfade.c in Sources */ = {isa = PBXBuildFile; fileRef = 501D30091E96C00000DE30A6 /* rolnfade.c */; };
1717
501D30181E96C00000DE30A6 /* warp_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 501D300A1E96C00000DE30A6 /* warp_text.c */; };
1818
501D30191E96C00000DE30A6 /* remote_overlay.c in Sources */ = {isa = PBXBuildFile; fileRef = 501D300B1E96C00000DE30A6 /* remote_overlay.c */; };
19-
501D301A1E96C00000DE30A8 /* remote.png in Resources */ = {isa = PBXBuildFile; fileRef = 501D300C1E96C00000DE30A8 /* remote.png */; };
2019
/* End PBXBuildFile section */
2120

2221
/* Begin PBXContainerItemProxy section */
@@ -66,6 +65,12 @@
6665
/* End PBXFileReference section */
6766

6867
/* Begin PBXFileSystemSynchronizedRootGroup section */
68+
504B277E2EC28D0C005AE698 /* shared */ = {
69+
isa = PBXFileSystemSynchronizedRootGroup;
70+
name = shared;
71+
path = ../shared;
72+
sourceTree = SOURCE_ROOT;
73+
};
6974
506E5C502E91B90700F39B20 /* acidwarp */ = {
7075
isa = PBXFileSystemSynchronizedRootGroup;
7176
path = acidwarp;
@@ -111,12 +116,12 @@
111116
506E5C452E91B90700F39B20 = {
112117
isa = PBXGroup;
113118
children = (
119+
504B277E2EC28D0C005AE698 /* shared */,
114120
506E5C502E91B90700F39B20 /* acidwarp */,
115121
506E5C622E91B90800F39B20 /* acidwarpTests */,
116122
506E5C6C2E91B90800F39B20 /* acidwarpUITests */,
117123
506E5CA92E91BAD300F39B20 /* Frameworks */,
118124
506E5C4F2E91B90700F39B20 /* Products */,
119-
508DE7F22EB59A1000C79955 /* Recovered References */,
120125
);
121126
sourceTree = "<group>";
122127
};
@@ -137,24 +142,6 @@
137142
name = Frameworks;
138143
sourceTree = "<group>";
139144
};
140-
508DE7F22EB59A1000C79955 /* Recovered References */ = {
141-
isa = PBXGroup;
142-
children = (
143-
501D30021E96C00000DE30A6 /* acidwarp.c */,
144-
501D30031E96C00000DE30A6 /* bit_map.c */,
145-
501D30041E96C00000DE30A6 /* display.c */,
146-
501D30051E96C00000DE30A6 /* draw.c */,
147-
501D30061E96C00000DE30A6 /* gen_img.c */,
148-
501D30071E96C00000DE30A6 /* img_float.c */,
149-
501D30081E96C00000DE30A6 /* palinit.c */,
150-
501D30091E96C00000DE30A6 /* rolnfade.c */,
151-
501D300A1E96C00000DE30A6 /* warp_text.c */,
152-
501D300B1E96C00000DE30A6 /* remote_overlay.c */,
153-
501D300C1E96C00000DE30A8 /* remote.png */,
154-
);
155-
name = "Recovered References";
156-
sourceTree = "<group>";
157-
};
158145
/* End PBXGroup section */
159146

160147
/* Begin PBXNativeTarget section */
@@ -176,6 +163,7 @@
176163
dependencies = (
177164
);
178165
fileSystemSynchronizedGroups = (
166+
504B277E2EC28D0C005AE698 /* shared */,
179167
506E5C502E91B90700F39B20 /* acidwarp */,
180168
);
181169
name = "acidwarp-macos";
@@ -279,7 +267,6 @@
279267
isa = PBXResourcesBuildPhase;
280268
buildActionMask = 2147483647;
281269
files = (
282-
501D301A1E96C00000DE30A8 /* remote.png in Resources */,
283270
);
284271
runOnlyForDeploymentPostprocessing = 0;
285272
};
@@ -388,15 +375,6 @@
388375
isa = PBXSourcesBuildPhase;
389376
buildActionMask = 2147483647;
390377
files = (
391-
501D30101E96C00000DE30A6 /* acidwarp.c in Sources */,
392-
501D30111E96C00000DE30A6 /* bit_map.c in Sources */,
393-
501D30121E96C00000DE30A6 /* display.c in Sources */,
394-
501D30131E96C00000DE30A6 /* draw.c in Sources */,
395-
501D30141E96C00000DE30A6 /* gen_img.c in Sources */,
396-
501D30161E96C00000DE30A6 /* palinit.c in Sources */,
397-
501D30191E96C00000DE30A6 /* remote_overlay.c in Sources */,
398-
501D30171E96C00000DE30A6 /* rolnfade.c in Sources */,
399-
501D30181E96C00000DE30A6 /* warp_text.c in Sources */,
400378
);
401379
runOnlyForDeploymentPostprocessing = 0;
402380
};
@@ -571,6 +549,10 @@
571549
"$(SRCROOT)/../SDL3.xcframework/macos-arm64_x86_64",
572550
"$(SRCROOT)/../SDL3_image.xcframework/macos-arm64_x86_64",
573551
);
552+
HEADER_SEARCH_PATHS = (
553+
"$(inherited)",
554+
"$(SRCROOT)/../shared",
555+
);
574556
GCC_PREPROCESSOR_DEFINITIONS = (
575557
"$(inherited)",
576558
"GL_SILENCE_DEPRECATION=1",
@@ -629,6 +611,10 @@
629611
"$(SRCROOT)/../SDL3.xcframework/macos-arm64_x86_64",
630612
"$(SRCROOT)/../SDL3_image.xcframework/macos-arm64_x86_64",
631613
);
614+
HEADER_SEARCH_PATHS = (
615+
"$(inherited)",
616+
"$(SRCROOT)/../shared",
617+
);
632618
GCC_PREPROCESSOR_DEFINITIONS = (
633619
"$(inherited)",
634620
"GL_SILENCE_DEPRECATION=1",

‎macos/acidwarp/AboutMenu.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// functionality, but it considered "good enough" as-is.
44

55
#import <Cocoa/Cocoa.h>
6-
#import "acidwarp/AboutMenu.h"
6+
#import "AboutMenu.h"
77
#import "AboutWindowController.h"
88

99
// Add a category to NSObject so any object in the responder chain can handle this

‎macos/acidwarp/acidwarp‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)