Poke the plists: get the development language from Xcode build.

Fix locations of the system plugin headers.
Minor Xcode maintenance.
2020-10-01 01:51:38 -06:00 · 2020-10-01 01:26:45 -06:00 · 2020-09-21 20:44:04 -06:00 · 2020-01-07 16:27:29 -07:00 · 2018-04-05 02:40:46 -05:00 · 2017-08-16 23:34:17 -05:00
6 changed files with 33 additions and 26 deletions
@@ -89,10 +89,10 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		089C167EFE841241C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		1B46D09C14293CAD0025EF88 /* libz.1.2.5.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.2.5.dylib; path = usr/lib/libz.1.2.5.dylib; sourceTree = SDKROOT; };
 		275CEE4919D5189200901DD8 /* ECS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ECS.cpp; sourceTree = "<group>"; };
 		275CEE4A19D5189200901DD8 /* ECS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECS.h; sourceTree = "<group>"; };
@@ -202,11 +202,11 @@
 		275CEEF519D5195B00901DD8 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* Bliss.oecoreplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Bliss.oecoreplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		94BE9E79171695AE00AB08E6 /* OEIntellivisionSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEIntellivisionSystemResponderClient.h; path = ../OpenEmu/Intellivision/OEIntellivisionSystemResponderClient.h; sourceTree = "<group>"; };
+		94BE9E79171695AE00AB08E6 /* OEIntellivisionSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEIntellivisionSystemResponderClient.h; path = ../OpenEmu/SystemPlugins/Intellivision/OEIntellivisionSystemResponderClient.h; sourceTree = "<group>"; };
 		C66DFC180F51D82F0080AA28 /* BlissGameCore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BlissGameCore.mm; sourceTree = "<group>"; };
 		C66DFC190F51D82F0080AA28 /* BlissGameCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlissGameCore.h; sourceTree = "<group>"; };
 		C6D120E71711302600E868A8 /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenEmuBase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = ../../../../../../../../../System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -234,6 +234,7 @@
 			);
 			name = CrabEmu;
 			sourceTree = "<group>";
+			usesTabs = 0;
 		};
 		089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = {
 			isa = PBXGroup;
@@ -512,12 +513,11 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 0700;
 			};
 			buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Bliss" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
@@ -631,7 +631,7 @@
 		089C167DFE841241C02AAC07 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				089C167EFE841241C02AAC07 /* English */,
+				089C167EFE841241C02AAC07 /* en */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -27,7 +27,12 @@ typedef char					CHAR;

 #if !defined(BOOL)
 #if defined(__MACH__)
+#if defined(__arm64__)
+#include <stdbool.h>
+typedef _Bool                   BOOL;
+#else
 typedef signed char				BOOL;
+#endif
 #else
 typedef int						BOOL;
 #endif
@@ -181,7 +181,7 @@ static uint8_t _keyboardShiftCount = 0;
 {
 	char cfgFilename[PATH_MAX] = {0};
 	NSString *cfgString = [[NSBundle bundleForClass:[self class]] pathForResource:@"knowncarts" ofType:@"cfg" inDirectory:@""];
-	strncpy(cfgFilename, cfgString.UTF8String, sizeof(cfgFilename));
+	strncpy(cfgFilename, cfgString.fileSystemRepresentation, sizeof(cfgFilename));

 	if(!cfgFilename[0])
 		return FALSE;
@@ -205,7 +205,7 @@ static uint8_t _keyboardShiftCount = 0;
 			return FALSE;

 		CHAR fileSubname[MAX_PATH];
-		CHAR* filenameStart = strrchr(filename, '/')+1;
+		const CHAR* filenameStart = strrchr(filename, '/')+1;
 		strncpy(fileSubname, filenameStart, strlen(filenameStart)-4);
 		*(fileSubname+strlen(filenameStart)-4) = NULL;
 	}
@@ -217,7 +217,7 @@ static uint8_t _keyboardShiftCount = 0;
 			return FALSE;

 		CHAR fileSubname[MAX_PATH];
-		CHAR* filenameStart = strrchr(filename, '/')+1;
+		const CHAR* filenameStart = strrchr(filename, '/')+1;
 		strncpy(fileSubname, filenameStart, strlen(filenameStart)-4);
 		*(fileSubname+strlen(filenameStart)-4) = NULL;
 	}
@@ -229,7 +229,7 @@ static uint8_t _keyboardShiftCount = 0;
 			return FALSE;

 		CHAR fileSubname[MAX_PATH];
-		CHAR* filenameStart = strrchr(filename, '/')+1;
+		const CHAR* filenameStart = strrchr(filename, '/')+1;
 		strncpy(fileSubname, filenameStart, strlen(filenameStart)-4);
 		*(fileSubname+strlen(filenameStart)-4) = NULL;
 	}
@@ -371,7 +371,7 @@ static uint8_t _keyboardShiftCount = 0;
 {
    _ROMName = [path copy];

-	if(![self LoadRip:[path UTF8String]])
+	if(![self LoadRip:path.fileSystemRepresentation])
 	{
 		return FALSE;
 	}
@@ -471,9 +471,14 @@ static uint8_t _keyboardShiftCount = 0;
    return OEIntSizeMake(INTV_IMAGE_WIDTH * (12.0/7.0), INTV_IMAGE_HEIGHT);
 }

- (const void *)videoBuffer
+- (const void *)getVideoBufferWithHint:(void *)hint
 {
-    return _videoBuffer;
+    if (!hint) {
+        if (!_videoBuffer) _videoBuffer = new unsigned char[256 * 256 * 4];
+        hint = _videoBuffer;
+    }
+
+    return _videoBuffer = (uint8_t*)hint;
 }

 - (GLenum)pixelFormat
@@ -486,11 +491,6 @@ static uint8_t _keyboardShiftCount = 0;
    return GL_UNSIGNED_INT_8_8_8_8_REV;
 }

- (GLenum)internalPixelFormat
-{
-    return GL_RGB8;
-}
-
 - (NSTimeInterval)frameInterval
 {
 	// http://spatula-city.org/~im14u2c/intv/tech/master.html
@@ -631,14 +631,14 @@ void BlissAudioMixer::flushAudio()
 void BlissVideoBus::init(UINT32 width, UINT32 height)
 {
 	VideoBus::init(width, height);
-
-	_currentCore->_videoBuffer = new unsigned char[256 * 256 * 4];
 }

 void BlissVideoBus::release()
 {
-	delete[] _currentCore->_videoBuffer;
-	_currentCore->_videoBuffer = NULL;
+    if (_currentCore->_videoBuffer) {
+        delete[] _currentCore->_videoBuffer;
+        _currentCore->_videoBuffer = NULL;
+    }

 	VideoBus::release();
 }
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
Author	SHA1	Message	Date
C.W. Betts	efdd9f803b	Poke the plists: get the development language from Xcode build.	2020-10-01 01:51:38 -06:00
C.W. Betts	739e0cec44	Fix locations of the system plugin headers. Minor Xcode maintenance.	2020-10-01 01:26:45 -06:00
C.W. Betts	f61b0cbf40	Fix build failure on ARM64.	2020-09-21 20:44:04 -06:00
C.W. Betts	f355fd8cb4	Update language resources. This quiets warnings in newer Xcode releases.	2020-01-07 16:27:29 -07:00
clobber	cd54554708	Build fix for latest Clang. BlissGameCore.mm:208:9: error: cannot initialize a variable of type 'CHAR ' (aka 'char ') with an rvalue of type 'const char ' BlissGameCore.mm:220:9: error: cannot initialize a variable of type 'CHAR ' (aka 'char ') with an rvalue of type 'const char ' BlissGameCore.mm:232:9: error: cannot initialize a variable of type 'CHAR ' (aka 'char ') with an rvalue of type 'const char *'	2018-04-05 02:40:46 -05:00
clobber	45752a8ce1	Use -fileSystemRepresentation instead of -UTF8String for file names	2017-08-16 23:34:17 -05:00
Rudy Richter	2a80001762	Use spaces	2017-07-20 08:49:36 -04:00
mrvacbob	21bef53e22	Enable direct-rendering 2	2017-07-20 01:59:41 -07:00
mrvacbob	e9737a1a7f	Enable direct-rendering	2017-07-20 00:53:19 -07:00
				`@@ -0,0 +1,2 @@`
				`/* Localized versions of Info.plist keys */`