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

Compare commits

base: OpenEmu/BSNES-Core:v114
Branches Tags
OpenEmu/BSNES-Core:master
OpenEmu/BSNES-Core:v115 OpenEmu/BSNES-Core:v114
..
compare: OpenEmu/BSNES-Core:master
Branches Tags
OpenEmu/BSNES-Core:master
OpenEmu/BSNES-Core:v115 OpenEmu/BSNES-Core:v114

7 Commits
v114 .. master

Author SHA1 Message Date
Daniele Cattaneo c21062858b Update the bsnes submodule URL. Warning: you may need to delete and re-init the submodule. 
Fixes #1.
 2021-04-20 03:47:04 +02:00
C.W. Betts 04df9bc1af Remove VALID_ARCHS 2021-01-16 14:08:06 -07:00
C.W. Betts 524d4f01be Poke the plists: get the development language from Xcode build. 2020-10-01 01:51:37 -06:00
C.W. Betts 83db349500 Fix locations of the system plugin headers. 
Minor Xcode maintenance.
 2020-10-01 01:26:41 -06:00
C.W. Betts 53cec453dd Revert "set deployment target to match OpenEmuCore's, of 10.14.4." 2020-09-22 09:29:29 -06:00
C.W. Betts fc9da2c73e set deployment target to match OpenEmuCore's, of 10.14.4. 2020-09-22 02:51:49 -06:00
clobber f5d5eb1cf9 Update to BSNES 115. 2020-05-04 16:01:16 -06:00
5 changed files with 26 additions and 20 deletions
Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "bsnes"]
path = bsnes
url = git@github.com:byuu/bsnes.git
url = git@github.com:bsnes-emu/bsnes.git
BSNES.xcodeproj/project.pbxproj
+9 -14
View File
@@ -749,7 +749,7 @@
82B9198710150FA9007BD6DB /* bsnes.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = bsnes.icns; sourceTree = "<group>"; };
8D5B49B6048680CD000E48DA /* BSNES.oecoreplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BSNES.oecoreplugin; sourceTree = BUILT_PRODUCTS_DIR; };
8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C6480FFB1364B2E10094FA33 /* OESNESSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESNESSystemResponderClient.h; path = ../OpenEmu/SuperNES/OESNESSystemResponderClient.h; sourceTree = "<group>"; };
C6480FFB1364B2E10094FA33 /* OESNESSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESNESSystemResponderClient.h; path = ../OpenEmu/SystemPlugins/SuperNES/OESNESSystemResponderClient.h; sourceTree = "<group>"; };
C6D120EB1711307900E868A8 /* 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>"; };
/* End PBXFileReference section */
@@ -2291,7 +2291,6 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1130;
};
buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "BSNES" */;
@@ -2433,14 +2432,14 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 114;
CURRENT_PROJECT_VERSION = 115;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
GCC_UNROLL_LOOPS = YES;
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/bsnes\"";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
MARKETING_VERSION = 114;
MARKETING_VERSION = 115;
OTHER_CFLAGS = (
"-DGB_INTERNAL",
"-DDISABLE_DEBUGGER",
@@ -2460,14 +2459,14 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 114;
CURRENT_PROJECT_VERSION = 115;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_UNROLL_LOOPS = YES;
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/bsnes\"";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
MARKETING_VERSION = 114;
MARKETING_VERSION = 115;
OTHER_CFLAGS = (
"-DGB_INTERNAL",
"-DDISABLE_DEBUGGER",
@@ -2522,10 +2521,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.11;
"MACOSX_DEPLOYMENT_TARGET[arch=arm64]" = 11.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
VALID_ARCHS = x86_64;
};
name = Debug;
};
@@ -2568,9 +2567,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.11;
"MACOSX_DEPLOYMENT_TARGET[arch=arm64]" = 11.0;
SDKROOT = macosx;
VALID_ARCHS = x86_64;
};
name = Release;
};
@@ -2580,7 +2579,6 @@
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Distribution;
SKIP_INSTALL = YES;
};
@@ -2592,7 +2590,6 @@
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Distribution;
SKIP_INSTALL = YES;
};
@@ -2604,7 +2601,6 @@
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "Build & Install";
SKIP_INSTALL = YES;
};
@@ -2616,7 +2612,6 @@
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "Build & Install";
SKIP_INSTALL = YES;
};
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>
bsnes
+1 -1
Submodule bsnes updated: 55e78b03de...8e80d2f8a4
program.mm
+14 -3
View File
@@ -41,7 +41,7 @@ struct Program : Emulator::Platform {
auto open(uint id, string name, vfs::file::mode mode, bool required) -> shared_pointer<vfs::file> override;
auto load(uint id, string name, string type, vector<string> options = {}) -> Emulator::Platform::Load override;
auto videoFrame(const uint16* data, uint pitch, uint width, uint height, uint scale) -> void override;
auto audioFrame(const float* samples, uint channels) -> void override;
auto audioFrame(const double* samples, uint channels) -> void override;
auto inputPoll(uint port, uint device, uint input) -> int16 override;
auto inputRumble(uint port, uint device, uint input, bool enable) -> void override;
@@ -197,7 +197,7 @@ static int16_t d2i16(double v)
return int16_t(floor(v + 0.5));
}
auto Program::audioFrame(const float* samples, uint channels) -> void
auto Program::audioFrame(const double* samples, uint channels) -> void
{
int16_t data[2];
data[0] = d2i16(samples[0]);
@@ -246,7 +246,18 @@ auto Program::openRomSuperFamicom(string name, vfs::file::mode mode) -> shared_p
if(name == "expansion.rom" && mode == vfs::file::mode::read) {
return vfs::memory::file::open(superFamicom.expansion.data(), superFamicom.expansion.size());
}
if(name == "msu1/data.rom")
{
return vfs::fs::file::open({Location::notsuffix(superFamicom.location), ".msu"}, mode);
}
if(name.match("msu1/track*.pcm"))
{
name.trimLeft("msu1/track", 1L);
return vfs::fs::file::open({Location::notsuffix(superFamicom.location), name}, mode);
}
/* DSP3.rom */
if ((name == "upd7725.program.rom" || name == "upd7725.data.rom") && !superFamicom.firmware.size()) {
if(auto memory = superFamicom.document["game/board/memory(type=ROM,content=Program,architecture=uPD7725)"]) {