OpenEmu/O2EM-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: OpenEmu/O2EM-Core:v1.18.1
Branches Tags
OpenEmu/O2EM-Core:master
OpenEmu/O2EM-Core:v1.18.1 OpenEmu/O2EM-Core:v1.18
...
compare: OpenEmu/O2EM-Core:master
Branches Tags
OpenEmu/O2EM-Core:master
OpenEmu/O2EM-Core:v1.18.1 OpenEmu/O2EM-Core:v1.18

9 Commits
v1.18.1 ... master

Author SHA1 Message Date
C.W. Betts e92cf384b9 Remove VALID_ARCHS. 2021-01-19 14:36:03 -07:00
C.W. Betts a6bcfbebb4 Remove VALID_ARCHS 2021-01-17 02:34:57 -07:00
C.W. Betts f79b958cc9 Poke the plists: get the development language from Xcode build. 2020-10-01 01:51:37 -06:00
C.W. Betts f2081e4abd Fix locations of the system plugin headers. 
Minor Xcode maintenance.
 2020-10-01 01:26:41 -06:00
C.W. Betts c0a1c05db7 Revert be33129c08: the fix is already in there. 2020-09-18 16:18:39 -06:00
C.W. Betts be33129c08 Declare retro_destroybmp in OddysseyGameCore. 
Fixes compiler error.
 2020-09-18 16:16:44 -06:00
C.W. Betts 1a5f5f01d9 Quiet a couple of warnings. 2020-01-08 01:32:20 -07:00
C.W. Betts 6830f21631 Update language resources. 
This quiets warnings in newer Xcode releases.

Also update framework locations.
 2020-01-08 01:14:46 -07:00
mrvacbob ed303db6fe Convert to modern syntax 2019-06-02 12:57:58 -07:00
5 changed files with 24 additions and 25 deletions
Expand all files Collapse all files
English.lproj/InfoPlist.strings
BIN
View File
Binary file not shown.
Info.plist
+1 -1
View File
@@ -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>
O2EM.xcodeproj/project.pbxproj
+13 -18
View File
@@ -86,13 +86,13 @@
/* End PBXCopyFilesBuildPhase 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; };
8D5B49B6048680CD000E48DA /* O2EM.oecoreplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = O2EM.oecoreplugin; sourceTree = BUILT_PRODUCTS_DIR; };
8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9415A9C519B10FFE0063758C /* OEOdyssey2SystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEOdyssey2SystemResponderClient.h; path = ../OpenEmu/Odyssey2/OEOdyssey2SystemResponderClient.h; sourceTree = "<group>"; };
9415A9C519B10FFE0063758C /* OEOdyssey2SystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEOdyssey2SystemResponderClient.h; path = ../OpenEmu/SystemPlugins/Odyssey2/OEOdyssey2SystemResponderClient.h; sourceTree = "<group>"; };
941DFB2615B6425200C6552F /* OdysseyGameCore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OdysseyGameCore.m; sourceTree = "<group>"; };
94AD8A37199AD89200E6520F /* wrapalleg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wrapalleg.c; sourceTree = "<group>"; };
94AD8A38199AD89200E6520F /* wrapalleg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrapalleg.h; sourceTree = "<group>"; };
@@ -129,9 +129,9 @@
94AD8A73199AD89200E6520F /* vpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vpp.h; sourceTree = "<group>"; };
94AD8A74199AD89200E6520F /* vpp_cset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vpp_cset.c; sourceTree = "<group>"; };
94AD8A75199AD89200E6520F /* vpp_cset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vpp_cset.h; sourceTree = "<group>"; };
94AE2EF917B0C1330018DFBB /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenEmuBase.framework; path = "../../../Library/Developer/Xcode/DerivedData/OpenEmu-dsehantrxgyfywdpbneyslftzzvv/Build/Products/Debug/OpenEmuBase.framework"; sourceTree = "<group>"; };
94AE2EF917B0C1330018DFBB /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenEmuBase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B5008DAD0E8BFB3E005AECAF /* OdysseyGameCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OdysseyGameCore.h; sourceTree = "<group>"; };
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 */
@@ -153,20 +153,20 @@
94A9E27F157D637B0083A7DC /* Core */,
08FB77AFFE84173DC02AAC07 /* Classes */,
089C167CFE841241C02AAC07 /* Resources */,
089C1671FE841209C02AAC07 /* Frameworks and Libraries */,
089C1671FE841209C02AAC07 /* Frameworks */,
19C28FB8FE9D52D311CA2CBB /* Products */,
);
name = VisualBoyAdvance;
sourceTree = "<group>";
usesTabs = 0;
};
089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = {
089C1671FE841209C02AAC07 /* Frameworks */ = {
isa = PBXGroup;
children = (
1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */,
1058C7AEFEA557BF11CA2CBB /* Other Frameworks */,
);
name = "Frameworks and Libraries";
name = Frameworks;
sourceTree = "<group>";
};
089C167CFE841241C02AAC07 /* Resources */ = {
@@ -221,7 +221,7 @@
94AD8A36199AD89200E6520F /* allegrowrapper */,
94AD8A46199AD89200E6520F /* src */,
);
path = Core;
name = Core;
sourceTree = "<group>";
};
94AD8A36199AD89200E6520F /* allegrowrapper */ = {
@@ -300,12 +300,11 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0700;
};
buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "O2EM" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
en,
@@ -404,7 +403,7 @@
089C167DFE841241C02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
089C167EFE841241C02AAC07 /* English */,
089C167EFE841241C02AAC07 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
@@ -430,7 +429,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = O2EM;
SKIP_INSTALL = YES;
VALID_ARCHS = x86_64;
WRAPPER_EXTENSION = oecoreplugin;
};
name = Debug;
@@ -453,7 +451,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = O2EM;
SKIP_INSTALL = YES;
VALID_ARCHS = x86_64;
WRAPPER_EXTENSION = oecoreplugin;
};
name = Release;
@@ -491,7 +488,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
VALID_ARCHS = x86_64;
};
name = Debug;
};
@@ -527,7 +523,6 @@
HEADER_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.11;
SDKROOT = macosx;
VALID_ARCHS = x86_64;
};
name = Release;
};
OdysseyGameCore.m
+8 -6
View File
@@ -76,6 +76,8 @@ biosdir[MAXC], arkivo[MAXC][MAXC], biossux[MAXC], romssux[MAXC],
odyssey2[MAXC], g7400[MAXC], c52[MAXC], jopac[MAXC], file_l[MAXC], bios_l[MAXC],
file_v[MAXC],scorefile[MAXC], statefile[MAXC], path2[MAXC];
extern void retro_destroybmp(void);
static long filesize(FILE *stream){
long curpos, length;
curpos = ftell(stream);
@@ -446,7 +448,7 @@ OdysseyGameCore *current;
init_audio();
app_data.crc = crc32_file([path UTF8String]);
app_data.crc = crc32_file([path fileSystemRepresentation]);
//suck_bios();
o2flag = 1;
@@ -455,9 +457,9 @@ OdysseyGameCore *current;
//suck_roms();
NSString *biosROM = [[self biosDirectoryPath] stringByAppendingPathComponent:@"o2rom.bin"];
load_bios([biosROM UTF8String]);
load_bios([biosROM fileSystemRepresentation]);
load_cart([path UTF8String]);
load_cart([path fileSystemRepresentation]);
//if (app_data.voice) load_voice_samples(path2);
init_display();
@@ -483,7 +485,7 @@ OdysseyGameCore *current;
{
int16_t sample16 = (soundBuffer[i] - 128 ) << 8;
[[current ringBufferAtIndex:0] write:&sample16 maxLength:2];
[[current audioBufferAtIndex:0] write:&sample16 maxLength:2];
}
RLOOP=1;
@@ -567,7 +569,7 @@ OdysseyGameCore *current;
- (void)keyDown:(unsigned short)keyCode
{
NSNumber *virtualCode = [virtualPhysicalKeyMap objectForKey:[NSNumber numberWithInt:keyCode]];
NSNumber *virtualCode = [virtualPhysicalKeyMap objectForKey:@(keyCode)];
if(virtualCode)
key[[virtualCode intValue]] = 1;
@@ -575,7 +577,7 @@ OdysseyGameCore *current;
- (void)keyUp:(unsigned short)keyCode
{
NSNumber *virtualCode = [virtualPhysicalKeyMap objectForKey:[NSNumber numberWithInt:keyCode]];
NSNumber *virtualCode = [virtualPhysicalKeyMap objectForKey:@(keyCode)];
if(virtualCode)
key[[virtualCode intValue]] = 0;
en.lproj/InfoPlist.strings
+2
View File
@@ -0,0 +1,2 @@
/* Localized versions of Info.plist keys */