WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-22 22:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Add quit event to queue without using private SDL method

Browse Source
This commit is contained in:
Phil Marell
2021-08-08 16:57:24 +10:00
parent 9f5699a61e
commit 7ba11df286
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj
View File

@@ -9,10 +9,11 @@
/* Begin PBXBuildFile section */
4A04C5AC269AD58E009F5CA3 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4A04C59D269AD58E009F5CA3 /* MainMenu.xib */; };
4A04C5AF269AD600009F5CA3 /* AerofoilAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5AE269AD600009F5CA3 /* AerofoilAppDelegate.mm */; };
4A04C5B6269AE945009F5CA3 /* AerofoilApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5B5269AE945009F5CA3 /* AerofoilApplication.m */; };
4A04C5B6269AE945009F5CA3 /* AerofoilApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5B5269AE945009F5CA3 /* AerofoilApplication.mm */; };
4A04C5B7269AE96B009F5CA3 /* MacInit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5B0269AE243009F5CA3 /* MacInit.mm */; };
4A2818FE26BBDD35005A36C0 /* CompositeRenderedFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A2818EF26BBDD35005A36C0 /* CompositeRenderedFont.cpp */; };
4A2818FF26BBDD35005A36C0 /* CompositeRenderedFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2818FD26BBDD35005A36C0 /* CompositeRenderedFont.h */; };
4AA1EB5C26BF9556001D8CC6 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AA1EB4D26BF9399001D8CC6 /* Cocoa.framework */; };
5C54D0A02629B42400AB55E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C54D09F2629B42400AB55E0 /* Assets.xcassets */; };
5C54D0BE2629B72000AB55E0 /* stb_image_write.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C54D0BC2629B72000AB55E0 /* stb_image_write.h */; };
5C54D0BF2629B72000AB55E0 /* stb_image_write.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C54D0BD2629B72000AB55E0 /* stb_image_write.c */; };
@@ -600,9 +601,9 @@
4A04C5B0269AE243009F5CA3 /* MacInit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MacInit.mm; sourceTree = "<group>"; };
4A04C5B2269AE368009F5CA3 /* MacInit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MacInit.h; sourceTree = "<group>"; };
4A04C5B4269AE945009F5CA3 /* AerofoilApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AerofoilApplication.h; sourceTree = "<group>"; };
4A2818EF26BBDD35005A36C0 /* CompositeRenderedFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CompositeRenderedFont.cpp; path = CompositeRenderedFont.cpp; sourceTree = "<group>"; };
4A2818FD26BBDD35005A36C0 /* CompositeRenderedFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompositeRenderedFont.h; path = CompositeRenderedFont.h; sourceTree = "<group>"; };
4A04C5B5269AE945009F5CA3 /* AerofoilApplication.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AerofoilApplication.mm; sourceTree = "<group>"; };
4A2818EF26BBDD35005A36C0 /* CompositeRenderedFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompositeRenderedFont.cpp; sourceTree = "<group>"; };
4A2818FD26BBDD35005A36C0 /* CompositeRenderedFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompositeRenderedFont.h; sourceTree = "<group>"; };
4AA1EB4D26BF9399001D8CC6 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
5C54D0962629B42100AB55E0 /* Aerofoil.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Aerofoil.app; sourceTree = BUILT_PRODUCTS_DIR; };
5C54D09F2629B42400AB55E0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -1033,6 +1034,7 @@
files = (
5C54D636262D7E4800AB55E0 /* SDL2.framework in Frameworks */,
5C54D635262D7E4100AB55E0 /* libAerofoilShared.a in Frameworks */,
4AA1EB5C26BF9556001D8CC6 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1086,7 +1088,7 @@
5C54D0A42629B42400AB55E0 /* Info.plist */,
4A04C59D269AD58E009F5CA3 /* MainMenu.xib */,
4A04C5B4269AE945009F5CA3 /* AerofoilApplication.h */,
4A04C5B5269AE945009F5CA3 /* AerofoilApplication.m */,
4A04C5B5269AE945009F5CA3 /* AerofoilApplication.mm */,
4A04C5AD269AD600009F5CA3 /* AerofoilAppDelegate.h */,
4A04C5AE269AD600009F5CA3 /* AerofoilAppDelegate.mm */,
);
@@ -1513,6 +1515,7 @@
5C54D5D5262D746E00AB55E0 /* Frameworks */ = {
isa = PBXGroup;
children = (
4AA1EB4D26BF9399001D8CC6 /* Cocoa.framework */,
5C54D5D6262D759500AB55E0 /* SDL.xcodeproj */,
);
name = Frameworks;
@@ -2020,7 +2023,7 @@
5C54D67A262D889D00AB55E0 /* DrawQuad32P.cpp in Sources */,
5C54D67B262D889D00AB55E0 /* CopyQuadP.cpp in Sources */,
5C54D669262D886900AB55E0 /* GpThreadEvent_Cpp11.cpp in Sources */,
4A04C5B6269AE945009F5CA3 /* AerofoilApplication.m in Sources */,
4A04C5B6269AE945009F5CA3 /* AerofoilApplication.mm in Sources */,
5C54D65B262D84A900AB55E0 /* GpMain_SDL_X.cpp in Sources */,
5C54D67C262D889E00AB55E0 /* DrawQuadPaletteP.cpp in Sources */,
4A04C5B7269AE96B009F5CA3 /* MacInit.mm in Sources */,

8
AerofoilMac/AerofoilMac/AerofoilApplication.m → AerofoilMac/AerofoilMac/AerofoilApplication.mm
View File

@@ -1,13 +1,13 @@
#import "AerofoilApplication.h"
#include "SDL.h"
extern int SDL_SendQuit(void);
@implementation AerofoilApplication
- (void)terminate:(id)sender {
// TODO: Use Aerofoil method instead of private SDL method
SDL_SendQuit();
SDL_Event event;
event.quit.type = SDL_QUIT;
event.quit.timestamp = SDL_GetTicks();
SDL_PushEvent(&event);
}
@end