From bf7e9e04792cbb350e74903ea87d55cb591a7c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Mon, 6 Jun 2016 15:42:04 +0200 Subject: [PATCH] use shared Info.plist for bundles, add capabilities to it --- Mini vMac.xcodeproj/project.pbxproj | 38 +++++++++++++------ Mini vMac/Mac128K/CNFGGLOB.h | 5 +++ Mini vMac/MacII/CNFGGLOB.h | 5 +++ Mini vMac/MacII/Info.plist | 30 --------------- Mini vMac/MacPlus4M/CNFGGLOB.h | 5 +++ Mini vMac/MacPlus4M/Info.plist | 30 --------------- .../{Mac128K/Info.plist => PlugIn-Info.plist} | 19 +++++++++- 7 files changed, 58 insertions(+), 74 deletions(-) delete mode 100644 Mini vMac/MacII/Info.plist delete mode 100644 Mini vMac/MacPlus4M/Info.plist rename Mini vMac/{Mac128K/Info.plist => PlugIn-Info.plist} (60%) diff --git a/Mini vMac.xcodeproj/project.pbxproj b/Mini vMac.xcodeproj/project.pbxproj index b2fbcc2..9ffdfdb 100644 --- a/Mini vMac.xcodeproj/project.pbxproj +++ b/Mini vMac.xcodeproj/project.pbxproj @@ -178,7 +178,6 @@ /* Begin PBXFileReference section */ 283422CA1CF8EF8C0088B634 /* MacPlus4M.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MacPlus4M.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 283422CE1CF8EF8C0088B634 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 283422D71CF8EFD80088B634 /* EmulatorProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmulatorProtocol.h; sourceTree = ""; }; 283422E71CF8F1C80088B634 /* CNFGGLOB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNFGGLOB.h; sourceTree = ""; }; 283422E91CF8F1C80088B634 /* EMCONFIG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMCONFIG.h; sourceTree = ""; }; @@ -246,13 +245,13 @@ 283423961CF9C4CB0088B634 /* MacII.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MacII.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 283423991CF9C5380088B634 /* CNFGGLOB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNFGGLOB.h; sourceTree = ""; }; 2834239B1CF9C5380088B634 /* EMCONFIG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMCONFIG.h; sourceTree = ""; }; - 2834239C1CF9C5380088B634 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 283423E31CFA32800088B634 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; 283423E41CFA32800088B634 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = ""; }; 283423E51CFA32800088B634 /* Icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@3x.png"; sourceTree = ""; }; 283423EC1CFA329C0088B634 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; 283423ED1CFA329C0088B634 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = ""; }; 283423EE1CFA329C0088B634 /* Icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@3x.png"; sourceTree = ""; }; + 285A8C901D05AFD3002993DE /* PlugIn-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "PlugIn-Info.plist"; sourceTree = ""; }; 28848B601CDE97D600B86C45 /* InsertDiskViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InsertDiskViewController.h; sourceTree = ""; }; 28848B611CDE97D600B86C45 /* InsertDiskViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InsertDiskViewController.m; sourceTree = ""; }; 28848B631CDE97E900B86C45 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = ""; }; @@ -264,7 +263,6 @@ 289710D81CFB121F0089D463 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; 289710D91CFB121F0089D463 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = ""; }; 289710DA1CFB121F0089D463 /* Icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@3x.png"; sourceTree = ""; }; - 289710DB1CFB121F0089D463 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 28BA89741CE7315400A98104 /* KBKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KBKey.h; sourceTree = ""; }; 28BA89751CE7315400A98104 /* KBKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KBKey.m; sourceTree = ""; }; 28BA89761CE7315400A98104 /* KBKeyboardLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KBKeyboardLayout.h; sourceTree = ""; }; @@ -397,7 +395,6 @@ children = ( 283422E71CF8F1C80088B634 /* CNFGGLOB.h */, 283422E91CF8F1C80088B634 /* EMCONFIG.h */, - 283422CE1CF8EF8C0088B634 /* Info.plist */, 283423E31CFA32800088B634 /* Icon.png */, 283423E41CFA32800088B634 /* Icon@2x.png */, 283423E51CFA32800088B634 /* Icon@3x.png */, @@ -423,6 +420,7 @@ 283422D71CF8EFD80088B634 /* EmulatorProtocol.h */, 28CE8ECB1CD4CDC500FE25A8 /* MYOSGLUE.m */, 289710B71CFB0DC70089D463 /* CNFGGLOB.h */, + 285A8C901D05AFD3002993DE /* PlugIn-Info.plist */, ); name = Shared; sourceTree = ""; @@ -500,7 +498,6 @@ children = ( 283423991CF9C5380088B634 /* CNFGGLOB.h */, 2834239B1CF9C5380088B634 /* EMCONFIG.h */, - 2834239C1CF9C5380088B634 /* Info.plist */, 283423EC1CFA329C0088B634 /* Icon.png */, 283423ED1CFA329C0088B634 /* Icon@2x.png */, 283423EE1CFA329C0088B634 /* Icon@3x.png */, @@ -516,7 +513,6 @@ 289710D81CFB121F0089D463 /* Icon.png */, 289710D91CFB121F0089D463 /* Icon@2x.png */, 289710DA1CFB121F0089D463 /* Icon@3x.png */, - 289710DB1CFB121F0089D463 /* Info.plist */, ); path = Mac128K; sourceTree = ""; @@ -1134,7 +1130,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; @@ -1159,7 +1158,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; @@ -1184,7 +1186,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; @@ -1209,7 +1214,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; @@ -1234,7 +1242,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; @@ -1259,7 +1270,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; diff --git a/Mini vMac/Mac128K/CNFGGLOB.h b/Mini vMac/Mac128K/CNFGGLOB.h index 0bebc29..9bbb8b3 100644 --- a/Mini vMac/Mac128K/CNFGGLOB.h +++ b/Mini vMac/Mac128K/CNFGGLOB.h @@ -16,4 +16,9 @@ #define kROM_Size 0x00010000 +#ifdef PLIST_PREPROCESSOR +#define MNVMBundleDisplayName Mac 128K +#define MNVMBundleGetInfoString 128K, 512×342 +#else #include "../CNFGGLOB.h" +#endif diff --git a/Mini vMac/MacII/CNFGGLOB.h b/Mini vMac/MacII/CNFGGLOB.h index 590f321..a68fcf4 100644 --- a/Mini vMac/MacII/CNFGGLOB.h +++ b/Mini vMac/MacII/CNFGGLOB.h @@ -16,4 +16,9 @@ #define kROM_Size 0x00040000 +#ifdef PLIST_PREPROCESSOR +#define MNVMBundleDisplayName Mac II +#define MNVMBundleGetInfoString 8M, 1024×768, no sound +#else #include "../CNFGGLOB.h" +#endif diff --git a/Mini vMac/MacII/Info.plist b/Mini vMac/MacII/Info.plist deleted file mode 100644 index 6704a58..0000000 --- a/Mini vMac/MacII/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDisplayName - Mac II - CFBundleGetInfoString - 8M, 1024×768 @ 8-bit, no sound - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - MnvM - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - Emulator - - diff --git a/Mini vMac/MacPlus4M/CNFGGLOB.h b/Mini vMac/MacPlus4M/CNFGGLOB.h index 5d82767..e11487a 100644 --- a/Mini vMac/MacPlus4M/CNFGGLOB.h +++ b/Mini vMac/MacPlus4M/CNFGGLOB.h @@ -16,4 +16,9 @@ #define kROM_Size 0x00020000 +#ifdef PLIST_PREPROCESSOR +#define MNVMBundleDisplayName Mac Plus +#define MNVMBundleGetInfoString 4M, 512×342 +#else #include "../CNFGGLOB.h" +#endif diff --git a/Mini vMac/MacPlus4M/Info.plist b/Mini vMac/MacPlus4M/Info.plist deleted file mode 100644 index 1587422..0000000 --- a/Mini vMac/MacPlus4M/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDisplayName - Mac Plus - CFBundleGetInfoString - 4M, 512×342 - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - MnvM - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - Emulator - - diff --git a/Mini vMac/Mac128K/Info.plist b/Mini vMac/PlugIn-Info.plist similarity index 60% rename from Mini vMac/Mac128K/Info.plist rename to Mini vMac/PlugIn-Info.plist index f1388c1..ec752d4 100644 --- a/Mini vMac/Mac128K/Info.plist +++ b/Mini vMac/PlugIn-Info.plist @@ -3,9 +3,9 @@ CFBundleDisplayName - Mac 128K + MNVMBundleDisplayName CFBundleGetInfoString - 128K, 512×342 + MNVMBundleGetInfoString CFBundleDevelopmentRegion en CFBundleExecutable @@ -26,5 +26,20 @@ $(CURRENT_PROJECT_VERSION) NSPrincipalClass Emulator + MNVMCapabilities + + AutoSlow + EnableAutoSlow + ScreenWidth + vMacScreenWidth + ScreenHeight + vMacScreenHeight + ScreenDepth + vMacScreenDepth + FloppyDrives + NumDrives + Sound + MySoundEnabled +