OpenEmu/Flycast-Core
1
0
Fork 0
mirror of https://github.com/OpenEmu/Flycast-Core.git synced 2025-11-01 11:07:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add OEFCBridging.

Browse Source 
Mark more symbols as static.
This commit is contained in:
C.W. Betts
2021-02-24 22:00:02 -07:00
parent fd500d3440
commit 60008fe478
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Compatibility/OEFCBridging.h
+37
View File
@@ -0,0 +1,37 @@
// Copyright (c) 2021, OpenEmu Team
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
// * Neither the name of the OpenEmu Team nor the
// names of its contributors may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY OpenEmu Team ''AS IS'' AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL OpenEmu Team BE LIABLE FOR ANY
// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef OEFCBridging_h
#define OEFCBridging_h
// This header is to make sure that symbols are the same
// in both FlycastGameCore.mm and nullDC.cpp
#include <string>
extern char bios_dir[1024];
extern void dc_SetStateName (const std::string &fileName);
#endif /* OEFCBridging_h */
Compatibility/nullDC.cpp
+2 -3
View File
@@ -44,10 +44,9 @@ extern bool fast_forward_mode;
//OpenEmu start
#include "OEFCBridging.h"
#include <functional>
std::string OEStateFilePath;
extern char bios_dir[1024];
static std::string OEStateFilePath;
void dc_SetStateName (const std::string &fileName)
{
Flycast.xcodeproj/project.pbxproj
+2
View File
@@ -690,6 +690,7 @@
08E24C2C1BA2437900EEA1A5 /* OEDCSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEDCSystemResponderClient.h; path = ../OpenEmu/SystemPlugins/Dreamcast/OEDCSystemResponderClient.h; sourceTree = "<group>"; };
08E24C2D1BA2489000EEA1A5 /* Flycast-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Flycast-Prefix.pch"; sourceTree = SOURCE_ROOT; };
552EA8D625E47EA600879856 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
554395D325E763C600004D74 /* OEFCBridging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OEFCBridging.h; sourceTree = "<group>"; };
554FCB7D25E6F4F6000B8B24 /* zip_algorithm_bzip2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip_algorithm_bzip2.c; sourceTree = "<group>"; };
554FCB7E25E6F4F6000B8B24 /* zip_crypto_commoncrypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip_crypto_commoncrypto.c; sourceTree = "<group>"; };
554FCB7F25E6F4F6000B8B24 /* zip_crypto_commoncrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip_crypto_commoncrypto.h; sourceTree = "<group>"; };
@@ -2658,6 +2659,7 @@
5FEEDA8C25E46756000ABF02 /* deps_headers */,
EE0D7176228F83CA00D721E9 /* version.h */,
EE08144C21913448007FD1AB /* nullDC.cpp */,
554395D325E763C600004D74 /* OEFCBridging.h */,
);
path = Compatibility;
sourceTree = "<group>";
FlycastGameCore.mm
+2 -3
View File
@@ -29,6 +29,7 @@
#import <Carbon/Carbon.h>
#include "audiobackend_openemu.h"
#include "OEFCBridging.h"
#include "types.h"
#include "emulator.h"
@@ -102,7 +103,7 @@ __weak FlycastGameCore *_current;
free(_soundBuffer);
}
bool system_init;
static bool system_init;
char bios_dir[1024];
# pragma mark - Reicast Execution functions
@@ -113,8 +114,6 @@ extern void dc_start_game(const char *path);
extern int screen_width,screen_height;
extern void dc_SetStateName (const std::string &fileName);
int darw_printf(const char* text,...) {
va_list args;