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

Everything surrounding the build process set up, time to implement

Browse Source 
callbacks
This commit is contained in:
PGGB
2013-07-05 12:57:47 +02:00
parent e7fd27399e
commit 16f0d5c507
5 changed files with 190 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PPSSPP.xcodeproj/project.pbxproj
+29 -4
View File
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
8C74454E1786DB1E0008BE6A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CAFC18C1785C48600647A96 /* OpenGL.framework */; };
8C7445501786DC9D0008BE6A /* git-version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C74454F1786DC9D0008BE6A /* git-version.cpp */; };
8C99589B1785DB7000EE4CA8 /* sceOpenPSID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFA8C71785B3C200647A96 /* sceOpenPSID.cpp */; };
8C99589C1785DB7000EE4CA8 /* sceOpenPSID.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CAFA8C81785B3C200647A96 /* sceOpenPSID.h */; };
8C99589D1785DB7000EE4CA8 /* sceP3da.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFA8C91785B3C200647A96 /* sceP3da.cpp */; };
@@ -160,7 +162,7 @@
8CAFC1081785B4D900647A96 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CAFA8391785B3C200647A96 /* Timer.h */; };
8CAFC1091785B4D900647A96 /* Version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFA83A1785B3C200647A96 /* Version.cpp */; };
8CAFC1231785B6C400647A96 /* OpenEmuBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CAFC1221785B6C400647A96 /* OpenEmuBase.framework */; };
8CAFC1261785B6F700647A96 /* PPSSPPGameCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFC1251785B6F700647A96 /* PPSSPPGameCore.m */; };
8CAFC1261785B6F700647A96 /* PPSSPPGameCore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFC1251785B6F700647A96 /* PPSSPPGameCore.mm */; };
8CAFC1321785B99500647A96 /* backtrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFBB381785B3D200647A96 /* backtrace.cpp */; };
8CAFC1331785B99500647A96 /* backtrace.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CAFBB391785B3D200647A96 /* backtrace.h */; };
8CAFC1341785B9A900647A96 /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CAFBB331785B3D200647A96 /* mixer.cpp */; };
@@ -751,6 +753,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
8C74454F1786DC9D0008BE6A /* git-version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "git-version.cpp"; sourceTree = "<group>"; };
8CAFA7B41785AF4200647A96 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
8CAFA7B71785AF4200647A96 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
8CAFA7B81785AF4200647A96 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -1433,7 +1436,7 @@
8CAFC11D1785B63900647A96 /* PPSSPP-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "PPSSPP-Prefix.pch"; path = "../PPSSPP-Prefix.pch"; sourceTree = "<group>"; };
8CAFC1221785B6C400647A96 /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenEmuBase.framework; path = /Users/danielnagel/Git/OpenEmu/UME/../Build/Products/Debug/OpenEmuBase.framework; sourceTree = "<absolute>"; };
8CAFC1241785B6F700647A96 /* PPSSPPGameCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPSSPPGameCore.h; sourceTree = "<group>"; };
8CAFC1251785B6F700647A96 /* PPSSPPGameCore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPSSPPGameCore.m; sourceTree = "<group>"; };
8CAFC1251785B6F700647A96 /* PPSSPPGameCore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PPSSPPGameCore.mm; sourceTree = "<group>"; };
8CAFC12E1785B93F00647A96 /* libnative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnative.a; sourceTree = BUILT_PRODUCTS_DIR; };
8CAFC1631785C33D00647A96 /* libGPU.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libGPU.a; sourceTree = BUILT_PRODUCTS_DIR; };
8CAFC18C1785C48600647A96 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
@@ -1448,6 +1451,7 @@
8CAFC1D31785C7AC00647A96 /* libkirk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libkirk.a; sourceTree = BUILT_PRODUCTS_DIR; };
8CAFC1DB1785C7B300647A96 /* libxbrz.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libxbrz.a; sourceTree = BUILT_PRODUCTS_DIR; };
8CAFC1E31785C7CB00647A96 /* libCore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCore.a; sourceTree = BUILT_PRODUCTS_DIR; };
8CB3FB7A1786D2E500A3C50D /* OEPSPSystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEPSPSystemResponderClient.h; path = ../OpenEmu/PSP/OEPSPSystemResponderClient.h; sourceTree = "<group>"; };
8CB74E1A1785FED200C652A7 /* DisplayListInterpreter.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = DisplayListInterpreter.o; path = "../../Intermediates/PPSSPP.build/$(CONFIGURATION)/GPU.build/Objects-normal/x86_64/DisplayListInterpreter.o"; sourceTree = BUILT_PRODUCTS_DIR; };
8CB74E1B1785FED200C652A7 /* FragmentShaderGenerator.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = FragmentShaderGenerator.o; path = "../Build/Intermediates/PPSSPP.build/$(CONFIGURATION)/GPU.build/Objects-normal/x86_64/FragmentShaderGenerator.o"; sourceTree = "<group>"; };
8CB74E1C1785FED200C652A7 /* Framebuffer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = Framebuffer.o; path = "../Build/Intermediates/PPSSPP.build/$(CONFIGURATION)/GPU.build/Objects-normal/x86_64/Framebuffer.o"; sourceTree = "<group>"; };
@@ -1492,6 +1496,7 @@
8CB74E46178602E500C652A7 /* libCommon.a in Frameworks */,
8C9959121785DDBE00EE4CA8 /* libCore.a in Frameworks */,
8CAFC1231785B6C400647A96 /* OpenEmuBase.framework in Frameworks */,
8C74454E1786DB1E0008BE6A /* OpenGL.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1661,6 +1666,7 @@
8CAFA7D71785B3C200647A96 /* ppsspp */ = {
isa = PBXGroup;
children = (
8C74454F1786DC9D0008BE6A /* git-version.cpp */,
8CAFA7E41785B3C200647A96 /* Common */,
8CAFA83F1785B3C200647A96 /* Core */,
8CAFA9421785B3C200647A96 /* ext */,
@@ -2821,8 +2827,9 @@
isa = PBXGroup;
children = (
8CAFA7D71785B3C200647A96 /* ppsspp */,
8CB3FB7A1786D2E500A3C50D /* OEPSPSystemResponderClient.h */,
8CAFC1241785B6F700647A96 /* PPSSPPGameCore.h */,
8CAFC1251785B6F700647A96 /* PPSSPPGameCore.m */,
8CAFC1251785B6F700647A96 /* PPSSPPGameCore.mm */,
);
name = Classes;
sourceTree = "<group>";
@@ -3493,6 +3500,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 8CAFC1E41785C7CB00647A96 /* Build configuration list for PBXNativeTarget "Core" */;
buildPhases = (
8CB3FB781786CDF100A3C50D /* ShellScript */,
8CAFC1DF1785C7CB00647A96 /* Sources */,
8CAFC1E01785C7CB00647A96 /* Frameworks */,
8CAFC1E11785C7CB00647A96 /* Headers */,
@@ -3568,6 +3576,22 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
8CB3FB781786CDF100A3C50D /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Define BUILD_VERSION with git revision and build configuration\ngitBundle=`which git`\ngitDescribe=`cd ppsspp; ${gitBundle} describe --always`\n\necho \"const char *PPSSPP_GIT_VERSION = \\\"${gitDescribe}\\\";\" > ppsspp/git-version.cpp";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
8CAFA7CE1785B06F00647A96 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -3610,7 +3634,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8CAFC1261785B6F700647A96 /* PPSSPPGameCore.m in Sources */,
8CAFC1261785B6F700647A96 /* PPSSPPGameCore.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3926,6 +3950,7 @@
8CB74E111785F7CE00C652A7 /* sceNp.cpp in Sources */,
8CB74E131785F7E400C652A7 /* scePauth.cpp in Sources */,
8CB74E151785F7FA00C652A7 /* scePspNpDrm_user.cpp in Sources */,
8C7445501786DC9D0008BE6A /* git-version.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
PPSSPPGameCore.h
+1 -1
View File
@@ -26,10 +26,10 @@
#import <Cocoa/Cocoa.h>
#import <OpenEmuBase/OEGameCore.h>
#import "OEPSPSystemResponderClient.h"
@class OERingBuffer;
OE_EXPORTED_CLASS
@interface PPSSPPGameCore : OEGameCore
@end
PPSSPPGameCore.m
-37
View File
@@ -1,37 +0,0 @@
/*
Copyright (c) 2013, 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.
*/
#import "PPSSPPGameCore.h"
@interface PPSSPPGameCore ()
{
}
@end
@implementation PPSSPPGameCore
@end
PPSSPPGameCore.mm
+159
View File
@@ -0,0 +1,159 @@
/*
Copyright (c) 2013, 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.
*/
#import "PPSSPPGameCore.h"
#include "Core/CoreParameter.h"
#include "Core/System.h"
#include <OpenGL/OpenGL.h>
#include <string>
@interface PPSSPPGameCore () <OEPSPSystemResponderClient>
{
}
@end
@implementation PPSSPPGameCore
# pragma mark - Execution
- (BOOL)loadFileAtPath:(NSString *)path
{
std::string *fileToStart = new std::string([path UTF8String]);
CoreParameter coreParam;
coreParam.cpuCore = CPU_JIT;
coreParam.gpuCore = GPU_GLES;
coreParam.enableSound = YES;
coreParam.fileToStart = *fileToStart;
coreParam.mountIso = "";
coreParam.startPaused = false;
coreParam.enableDebugging = false;
coreParam.printfEmuLog = false;
coreParam.headLess = false;
coreParam.renderWidth = 480;
coreParam.renderHeight = 272;
coreParam.outputWidth = 480;
coreParam.outputHeight = 272;
coreParam.pixelWidth = 480;
coreParam.pixelHeight = 272;
std::string error_string;
if(!PSP_Init(coreParam, &error_string))
{
NSLog(@"ERROR: %s", error_string.c_str());
}
return NO;
}
- (void)setupEmulation
{
}
- (void)stopEmulation
{
[super stopEmulation];
}
- (void)resetEmulation
{
}
- (void)pauseEmulation:(id)sender
{
}
- (void)executeFrame
{
}
# pragma mark - Video
- (BOOL)rendersToOpenGL
{
return YES;
}
- (OEIntSize)bufferSize
{
return OEIntSizeMake(480, 272);
}
- (OEIntSize)aspectSize
{
return OEIntSizeMake(16, 9);
}
# pragma mark - Audio
- (NSUInteger)channelCount
{
return 2;
}
- (double)audioSampleRate
{
return 48000;
}
# pragma mark - Save States
- (BOOL)loadStateFromFileAtPath:(NSString *)fileName
{
return NO;
}
- (BOOL)saveStateToFileAtPath:(NSString *)fileName
{
return NO;
}
# pragma mark - Input
- (oneway void)didMovePSPJoystickDirection:(OEPSPButton)button withValue:(CGFloat)value forPlayer:(NSUInteger)player
{
}
-(oneway void)didPushPSPButton:(OEPSPButton)button forPlayer:(NSUInteger)player
{
}
- (oneway void)didReleasePSPButton:(OEPSPButton)button forPlayer:(NSUInteger)player
{
}
@end
ppsspp
+1 -1
Submodule ppsspp updated: 5e24021117...c743e02851