Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 clobber
|
13aaf1dff3 | ||
 Duckey77
|
a333641abd | ||
|
Duckey77
|
ba40e4d71b | ||
|
Duckey77
|
1171449681 | ||
|
Duckey77
|
9ad6f53cb1 | ||
|
Duckey77
|
3ad5bc01d7 | ||
|
Duckey77
|
944f898648 | ||
|
Duckey77
|
bcdca262ed | ||
|
Duckey77
|
6a28c2daef | ||
|
Duckey77
|
444fe83888 | ||
|
Duckey77
|
4638998471 | ||
|
Duckey77
|
91514f00bf | ||
|
Duckey77
|
9c28aa8d1e | ||
|
clobber
|
eafbb08dd3 | ||
|
clobber
|
c72e1327bd | ||
|
Duckey77
|
d83d1a4fd6 |
@@ -0,0 +1,169 @@
|
||||
// Copyright 2017 Dolphin Emulator Project
|
||||
// Licensed under GPLv2+
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "Core/Config/GraphicsSettings.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "Common/Config/Config.h"
|
||||
#include "VideoCommon/VideoConfig.h"
|
||||
|
||||
namespace Config
|
||||
{
|
||||
// Configuration Information
|
||||
|
||||
// Graphics.Hardware
|
||||
|
||||
const ConfigInfo<bool> GFX_VSYNC{{System::GFX, "Hardware", "VSync"}, false};
|
||||
const ConfigInfo<int> GFX_ADAPTER{{System::GFX, "Hardware", "Adapter"}, 0};
|
||||
|
||||
// Graphics.Settings
|
||||
|
||||
const ConfigInfo<bool> GFX_WIDESCREEN_HACK{{System::GFX, "Settings", "wideScreenHack"}, false};
|
||||
//OpenEmu change apect to strecth
|
||||
const ConfigInfo<AspectMode> GFX_ASPECT_RATIO{{System::GFX, "Settings", "AspectRatio"},
|
||||
AspectMode::Stretch};
|
||||
const ConfigInfo<AspectMode> GFX_SUGGESTED_ASPECT_RATIO{
|
||||
{System::GFX, "Settings", "SuggestedAspectRatio"}, AspectMode::Auto};
|
||||
const ConfigInfo<bool> GFX_CROP{{System::GFX, "Settings", "Crop"}, false};
|
||||
const ConfigInfo<int> GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES{
|
||||
{System::GFX, "Settings", "SafeTextureCacheColorSamples"}, 128};
|
||||
const ConfigInfo<bool> GFX_SHOW_FPS{{System::GFX, "Settings", "ShowFPS"}, false};
|
||||
const ConfigInfo<bool> GFX_SHOW_NETPLAY_PING{{System::GFX, "Settings", "ShowNetPlayPing"}, false};
|
||||
const ConfigInfo<bool> GFX_SHOW_NETPLAY_MESSAGES{{System::GFX, "Settings", "ShowNetPlayMessages"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_LOG_RENDER_TIME_TO_FILE{{System::GFX, "Settings", "LogRenderTimeToFile"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_OVERLAY_STATS{{System::GFX, "Settings", "OverlayStats"}, false};
|
||||
const ConfigInfo<bool> GFX_OVERLAY_PROJ_STATS{{System::GFX, "Settings", "OverlayProjStats"}, false};
|
||||
const ConfigInfo<bool> GFX_DUMP_TEXTURES{{System::GFX, "Settings", "DumpTextures"}, false};
|
||||
const ConfigInfo<bool> GFX_HIRES_TEXTURES{{System::GFX, "Settings", "HiresTextures"}, false};
|
||||
const ConfigInfo<bool> GFX_CACHE_HIRES_TEXTURES{{System::GFX, "Settings", "CacheHiresTextures"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_DUMP_EFB_TARGET{{System::GFX, "Settings", "DumpEFBTarget"}, false};
|
||||
const ConfigInfo<bool> GFX_DUMP_XFB_TARGET{{System::GFX, "Settings", "DumpXFBTarget"}, false};
|
||||
const ConfigInfo<bool> GFX_DUMP_FRAMES_AS_IMAGES{{System::GFX, "Settings", "DumpFramesAsImages"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_FREE_LOOK{{System::GFX, "Settings", "FreeLook"}, false};
|
||||
const ConfigInfo<bool> GFX_USE_FFV1{{System::GFX, "Settings", "UseFFV1"}, false};
|
||||
const ConfigInfo<std::string> GFX_DUMP_FORMAT{{System::GFX, "Settings", "DumpFormat"}, "avi"};
|
||||
const ConfigInfo<std::string> GFX_DUMP_CODEC{{System::GFX, "Settings", "DumpCodec"}, ""};
|
||||
const ConfigInfo<std::string> GFX_DUMP_ENCODER{{System::GFX, "Settings", "DumpEncoder"}, ""};
|
||||
const ConfigInfo<std::string> GFX_DUMP_PATH{{System::GFX, "Settings", "DumpPath"}, ""};
|
||||
const ConfigInfo<int> GFX_BITRATE_KBPS{{System::GFX, "Settings", "BitrateKbps"}, 25000};
|
||||
const ConfigInfo<bool> GFX_INTERNAL_RESOLUTION_FRAME_DUMPS{
|
||||
{System::GFX, "Settings", "InternalResolutionFrameDumps"}, false};
|
||||
const ConfigInfo<bool> GFX_ENABLE_GPU_TEXTURE_DECODING{
|
||||
{System::GFX, "Settings", "EnableGPUTextureDecoding"}, false};
|
||||
const ConfigInfo<bool> GFX_ENABLE_PIXEL_LIGHTING{{System::GFX, "Settings", "EnablePixelLighting"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_FAST_DEPTH_CALC{{System::GFX, "Settings", "FastDepthCalc"}, true};
|
||||
const ConfigInfo<u32> GFX_MSAA{{System::GFX, "Settings", "MSAA"}, 1};
|
||||
const ConfigInfo<bool> GFX_SSAA{{System::GFX, "Settings", "SSAA"}, false};
|
||||
const ConfigInfo<int> GFX_EFB_SCALE{{System::GFX, "Settings", "InternalResolution"}, 1};
|
||||
const ConfigInfo<bool> GFX_TEXFMT_OVERLAY_ENABLE{{System::GFX, "Settings", "TexFmtOverlayEnable"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_TEXFMT_OVERLAY_CENTER{{System::GFX, "Settings", "TexFmtOverlayCenter"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_ENABLE_WIREFRAME{{System::GFX, "Settings", "WireFrame"}, false};
|
||||
const ConfigInfo<bool> GFX_DISABLE_FOG{{System::GFX, "Settings", "DisableFog"}, false};
|
||||
const ConfigInfo<bool> GFX_BORDERLESS_FULLSCREEN{{System::GFX, "Settings", "BorderlessFullscreen"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_ENABLE_VALIDATION_LAYER{
|
||||
{System::GFX, "Settings", "EnableValidationLayer"}, false};
|
||||
|
||||
#if defined(ANDROID)
|
||||
const ConfigInfo<bool> GFX_BACKEND_MULTITHREADING{
|
||||
{System::GFX, "Settings", "BackendMultithreading"}, false};
|
||||
const ConfigInfo<int> GFX_COMMAND_BUFFER_EXECUTE_INTERVAL{
|
||||
{System::GFX, "Settings", "CommandBufferExecuteInterval"}, 0};
|
||||
#else
|
||||
const ConfigInfo<bool> GFX_BACKEND_MULTITHREADING{
|
||||
{System::GFX, "Settings", "BackendMultithreading"}, true};
|
||||
const ConfigInfo<int> GFX_COMMAND_BUFFER_EXECUTE_INTERVAL{
|
||||
{System::GFX, "Settings", "CommandBufferExecuteInterval"}, 100};
|
||||
#endif
|
||||
|
||||
//OpenEmu Change Ubershader defaults
|
||||
const ConfigInfo<bool> GFX_SHADER_CACHE{{System::GFX, "Settings", "ShaderCache"}, true};
|
||||
const ConfigInfo<bool> GFX_WAIT_FOR_SHADERS_BEFORE_STARTING{
|
||||
{System::GFX, "Settings", "WaitForShadersBeforeStarting"}, false};
|
||||
const ConfigInfo<ShaderCompilationMode> GFX_SHADER_COMPILATION_MODE{
|
||||
{System::GFX, "Settings", "ShaderCompilationMode"}, ShaderCompilationMode::Synchronous};
|
||||
const ConfigInfo<int> GFX_SHADER_COMPILER_THREADS{
|
||||
{System::GFX, "Settings", "ShaderCompilerThreads"}, -1};
|
||||
const ConfigInfo<int> GFX_SHADER_PRECOMPILER_THREADS{
|
||||
{System::GFX, "Settings", "ShaderPrecompilerThreads"}, -1};
|
||||
const ConfigInfo<bool> GFX_SAVE_TEXTURE_CACHE_TO_STATE{
|
||||
{System::GFX, "Settings", "SaveTextureCacheToState"}, true};
|
||||
// EndChange Ubershader defaults
|
||||
|
||||
const ConfigInfo<bool> GFX_SW_ZCOMPLOC{{System::GFX, "Settings", "SWZComploc"}, true};
|
||||
const ConfigInfo<bool> GFX_SW_ZFREEZE{{System::GFX, "Settings", "SWZFreeze"}, true};
|
||||
const ConfigInfo<bool> GFX_SW_DUMP_OBJECTS{{System::GFX, "Settings", "SWDumpObjects"}, false};
|
||||
const ConfigInfo<bool> GFX_SW_DUMP_TEV_STAGES{{System::GFX, "Settings", "SWDumpTevStages"}, false};
|
||||
const ConfigInfo<bool> GFX_SW_DUMP_TEV_TEX_FETCHES{{System::GFX, "Settings", "SWDumpTevTexFetches"},
|
||||
false};
|
||||
const ConfigInfo<int> GFX_SW_DRAW_START{{System::GFX, "Settings", "SWDrawStart"}, 0};
|
||||
const ConfigInfo<int> GFX_SW_DRAW_END{{System::GFX, "Settings", "SWDrawEnd"}, 100000};
|
||||
|
||||
const ConfigInfo<bool> GFX_PREFER_GLES{{System::GFX, "Settings", "PreferGLES"}, false};
|
||||
|
||||
// Graphics.Enhancements
|
||||
|
||||
const ConfigInfo<bool> GFX_ENHANCE_FORCE_FILTERING{{System::GFX, "Enhancements", "ForceFiltering"},
|
||||
false};
|
||||
const ConfigInfo<int> GFX_ENHANCE_MAX_ANISOTROPY{{System::GFX, "Enhancements", "MaxAnisotropy"}, 0};
|
||||
const ConfigInfo<std::string> GFX_ENHANCE_POST_SHADER{
|
||||
{System::GFX, "Enhancements", "PostProcessingShader"}, ""};
|
||||
const ConfigInfo<bool> GFX_ENHANCE_FORCE_TRUE_COLOR{{System::GFX, "Enhancements", "ForceTrueColor"},
|
||||
true};
|
||||
const ConfigInfo<bool> GFX_ENHANCE_DISABLE_COPY_FILTER{
|
||||
{System::GFX, "Enhancements", "DisableCopyFilter"}, true};
|
||||
const ConfigInfo<bool> GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION{
|
||||
{System::GFX, "Enhancements", "ArbitraryMipmapDetection"}, true};
|
||||
const ConfigInfo<float> GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION_THRESHOLD{
|
||||
{System::GFX, "Enhancements", "ArbitraryMipmapDetectionThreshold"}, 14.0f};
|
||||
|
||||
// Graphics.Stereoscopy
|
||||
|
||||
const ConfigInfo<StereoMode> GFX_STEREO_MODE{{System::GFX, "Stereoscopy", "StereoMode"},
|
||||
StereoMode::Off};
|
||||
const ConfigInfo<int> GFX_STEREO_DEPTH{{System::GFX, "Stereoscopy", "StereoDepth"}, 20};
|
||||
const ConfigInfo<int> GFX_STEREO_CONVERGENCE_PERCENTAGE{
|
||||
{System::GFX, "Stereoscopy", "StereoConvergencePercentage"}, 100};
|
||||
const ConfigInfo<bool> GFX_STEREO_SWAP_EYES{{System::GFX, "Stereoscopy", "StereoSwapEyes"}, false};
|
||||
const ConfigInfo<int> GFX_STEREO_CONVERGENCE{{System::GFX, "Stereoscopy", "StereoConvergence"}, 20};
|
||||
const ConfigInfo<bool> GFX_STEREO_EFB_MONO_DEPTH{{System::GFX, "Stereoscopy", "StereoEFBMonoDepth"},
|
||||
false};
|
||||
const ConfigInfo<int> GFX_STEREO_DEPTH_PERCENTAGE{
|
||||
{System::GFX, "Stereoscopy", "StereoDepthPercentage"}, 100};
|
||||
|
||||
// Graphics.Hacks
|
||||
|
||||
const ConfigInfo<bool> GFX_HACK_EFB_ACCESS_ENABLE{{System::GFX, "Hacks", "EFBAccessEnable"}, true};
|
||||
const ConfigInfo<bool> GFX_HACK_EFB_DEFER_INVALIDATION{
|
||||
{System::GFX, "Hacks", "EFBAccessDeferInvalidation"}, false};
|
||||
const ConfigInfo<int> GFX_HACK_EFB_ACCESS_TILE_SIZE{{System::GFX, "Hacks", "EFBAccessTileSize"},
|
||||
64};
|
||||
const ConfigInfo<bool> GFX_HACK_BBOX_ENABLE{{System::GFX, "Hacks", "BBoxEnable"}, false};
|
||||
const ConfigInfo<bool> GFX_HACK_FORCE_PROGRESSIVE{{System::GFX, "Hacks", "ForceProgressive"}, true};
|
||||
const ConfigInfo<bool> GFX_HACK_SKIP_EFB_COPY_TO_RAM{{System::GFX, "Hacks", "EFBToTextureEnable"},
|
||||
true};
|
||||
const ConfigInfo<bool> GFX_HACK_SKIP_XFB_COPY_TO_RAM{{System::GFX, "Hacks", "XFBToTextureEnable"},
|
||||
true};
|
||||
const ConfigInfo<bool> GFX_HACK_DISABLE_COPY_TO_VRAM{{System::GFX, "Hacks", "DisableCopyToVRAM"},
|
||||
false};
|
||||
const ConfigInfo<bool> GFX_HACK_DEFER_EFB_COPIES{{System::GFX, "Hacks", "DeferEFBCopies"}, true};
|
||||
const ConfigInfo<bool> GFX_HACK_IMMEDIATE_XFB{{System::GFX, "Hacks", "ImmediateXFBEnable"}, false};
|
||||
const ConfigInfo<bool> GFX_HACK_COPY_EFB_SCALED{{System::GFX, "Hacks", "EFBScaledCopy"}, true};
|
||||
const ConfigInfo<bool> GFX_HACK_EFB_EMULATE_FORMAT_CHANGES{
|
||||
{System::GFX, "Hacks", "EFBEmulateFormatChanges"}, false};
|
||||
const ConfigInfo<bool> GFX_HACK_VERTEX_ROUDING{{System::GFX, "Hacks", "VertexRounding"}, false};
|
||||
|
||||
// Graphics.GameSpecific
|
||||
|
||||
const ConfigInfo<bool> GFX_PERF_QUERIES_ENABLE{{System::GFX, "GameSpecific", "PerfQueriesEnable"},
|
||||
false};
|
||||
} // namespace Config
|
||||
@@ -3,44 +3,35 @@
|
||||
typedef struct
|
||||
{
|
||||
int openemuButton;
|
||||
unsigned dolphinButton;
|
||||
int value;
|
||||
} keymap;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
float Xaxis;
|
||||
float Yaxis;
|
||||
} axismap;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
keymap gc_pad_keymap[20] = {
|
||||
{OEGCButtonUp, OEDolJoypadUp, 0},
|
||||
{OEGCButtonDown,OEDolJoypadDown, 0},
|
||||
{OEGCButtonLeft, OEDolJoypadLeft, 0},
|
||||
{OEGCButtonRight, OEDolJoypadRight, 0},
|
||||
{OEGCAnalogUp, OEGCAnalog, 0},
|
||||
{OEGCAnalogDown, OEGCAnalog, 0},
|
||||
{OEGCAnalogLeft, OEGCAnalog, 0},
|
||||
{OEGCAnalogRight, OEGCAnalog, 0},
|
||||
{OEGCAnalogCUp, OEGCAnalogC, 0},
|
||||
{OEGCAnalogCDown, OEGCAnalogC, 0},
|
||||
{OEGCAnalogCLeft, OEGCAnalogC, 0},
|
||||
{OEGCAnalogCRight, OEGCAnalogC, 0},
|
||||
{OEGCButtonA, OEDolJoypadA, 0},
|
||||
{OEGCButtonB, OEDolJoypadB, 0},
|
||||
{OEGCButtonX, OEDolJoypadX, 0},
|
||||
{OEGCButtonY, OEDolJoypadY, 0},
|
||||
{OEGCButtonL, OEDolJoypadL, 0},
|
||||
{OEGCButtonR, OEDolJoypadR, 0},
|
||||
{OEGCButtonZ, OEDolJoypadR2, 0},
|
||||
{OEGCButtonStart, OEDolJoypadStart, 0},
|
||||
keymap gc_pad_keymap[22] = {
|
||||
{OEGCButtonUp, 0},
|
||||
{OEGCButtonDown, 0},
|
||||
{OEGCButtonLeft, 0},
|
||||
{OEGCButtonRight, 0},
|
||||
{OEGCAnalogUp, 0},
|
||||
{OEGCAnalogDown, 0},
|
||||
{OEGCAnalogLeft, 0},
|
||||
{OEGCAnalogRight, 0},
|
||||
{OEGCAnalogCUp, 0},
|
||||
{OEGCAnalogCDown, 0},
|
||||
{OEGCAnalogCLeft, 0},
|
||||
{OEGCAnalogCRight, 0},
|
||||
{OEGCButtonA, 0},
|
||||
{OEGCButtonB, 0},
|
||||
{OEGCButtonX, 0},
|
||||
{OEGCButtonY, 0},
|
||||
{OEGCButtonL, 0},
|
||||
{OEGCButtonR, 0},
|
||||
{OEGCButtonZ, 0},
|
||||
{OEGCButtonStart, 0},
|
||||
{OEGCDigitalL, 0},
|
||||
{OEGCDigitalR, 0},
|
||||
};
|
||||
|
||||
// axismap gc_pad_Analog;
|
||||
// axismap gc_pad_AnalogC;
|
||||
axismap gc_pad_Trigger;
|
||||
} gc_pad;
|
||||
|
||||
|
||||
@@ -50,96 +41,79 @@ void init_Callback();
|
||||
|
||||
static gc_pad GameCubePads[4];
|
||||
|
||||
//
|
||||
//static unsigned connected_wiimote_type[MAX_BBMOTES];
|
||||
//static int current_mote_id;
|
||||
//static InputConfig s_config(WIIMOTE_INI_NAME, _trans("Wii Remote"), "Wiimote");
|
||||
typedef struct
|
||||
{
|
||||
keymap wiimote_dpad[4] = {
|
||||
{OEWiiMoteButtonLeft, 0},
|
||||
{OEWiiMoteButtonRight, 0},
|
||||
{OEWiiMoteButtonDown, 0},
|
||||
{OEWiiMoteButtonUp, 0},
|
||||
};
|
||||
|
||||
keymap wiimote_sideways[4] = {
|
||||
{OEWiiMoteButtonUp, 0},
|
||||
{OEWiiMoteButtonDown, 0},
|
||||
{OEWiiMoteButtonLeft, 0},
|
||||
{OEWiiMoteButtonRight, 0},
|
||||
};
|
||||
|
||||
keymap wiimote_keymap[48] = {
|
||||
{OEWiiMoteButtonA, 0},
|
||||
{OEWiiMoteButtonB, 0},
|
||||
{OEWiiMoteButton1, 0},
|
||||
{OEWiiMoteButton2, 0},
|
||||
{OEWiiMoteButtonPlus, 0},
|
||||
{OEWiiMoteButtonMinus, 0},
|
||||
{OEWiiMoteButtonHome, 0},
|
||||
{OEWiiMoteTiltLeft, 0},
|
||||
{OEWiiMoteTiltRight, 0},
|
||||
{OEWiiMoteTiltForward, 0},
|
||||
{OEWiiMoteTiltBackward, 0},
|
||||
{OEWiiMoteShake, 0},
|
||||
{OEWiiMoteSwingUp, 0},
|
||||
{OEWiiMoteSwingDown, 0},
|
||||
{OEWiiMoteSwingLeft, 0},
|
||||
{OEWiiMoteSwingRight, 0},
|
||||
{OEWiiMoteSwingForward, 0},
|
||||
{OEWiiMoteSwingBackward, 0},
|
||||
{OEWiiNunchukAnalogUp, 0},
|
||||
{OEWiiNunchukAnalogDown, 0},
|
||||
{OEWiiNunchukAnalogLeft, 0},
|
||||
{OEWiiNunchukAnalogRight, 0},
|
||||
{OEWiiNunchukButtonC, 0},
|
||||
{OEWiiNunchukButtonZ, 0},
|
||||
{OEWiiNunchukShake, 0},
|
||||
{OEWiiClassicButtonUp, 0},
|
||||
{OEWiiClassicButtonDown, 0},
|
||||
{OEWiiClassicButtonLeft, 0},
|
||||
{OEWiiClassicButtonRight, 0},
|
||||
{OEWiiClassicAnalogLUp, 0},
|
||||
{OEWiiClassicAnalogLDown, 0},
|
||||
{OEWiiClassicAnalogLLeft, 0},
|
||||
{OEWiiClassicAnalogLRight, 0},
|
||||
{OEWiiClassicAnalogRUp, 0},
|
||||
{OEWiiClassicAnalogRDown, 0},
|
||||
{OEWiiClassicAnalogRLeft, 0},
|
||||
{OEWiiClassicAnalogRRight, 0},
|
||||
{OEWiiClassicButtonA, 0},
|
||||
{OEWiiClassicButtonB, 0},
|
||||
{OEWiiClassicButtonX, 0},
|
||||
{OEWiiClassicButtonY, 0},
|
||||
{OEWiiClassicButtonL, 0},
|
||||
{OEWiiClassicButtonR, 0},
|
||||
{OEWiiClassicButtonZl, 0},
|
||||
{OEWiiClassicButtonZr, 0},
|
||||
{OEWiiClassicButtonStart, 0},
|
||||
{OEWiiClassicButtonSelect, 0},
|
||||
{OEWiiClassicButtonHome, 0},
|
||||
};
|
||||
|
||||
OEWiiConType wiimoteType;
|
||||
ControlState dx, dy;
|
||||
} wii_remote;
|
||||
|
||||
//
|
||||
//typedef struct
|
||||
//{
|
||||
// keymap wiimote_keymap[12] = {
|
||||
// {OEWiiMoteButtonLeft, OEDolJoypadLeft, 0},
|
||||
// {OEWiiMoteButtonRight, OEDolJoypadRight, 0},
|
||||
// {OEWiiMoteButtonDown, OEDolJoypadDown, 0},
|
||||
// {OEWiiMoteButtonUp, OEDolJoypadUp, 0},
|
||||
// {OEWiiMoteButtonPlus, OEDolJoypadStart, 0},
|
||||
// {OEWiiMoteButton2, OEDolJoypadY, 0},
|
||||
// {OEWiiMoteButton1, OEDolJoypadX, 0},
|
||||
// {OEWiiMoteButtonB, OEDolJoypadB, 0},
|
||||
// {OEWiiMoteButtonA, OEDolJoypadA, 0},
|
||||
// {OEWiiMoteButtonMinus, OEDolJoypadSelect, 0},
|
||||
// {OEWiiMoteButtonHome, OEDolJoypadR3, 0},
|
||||
// {OEWiiMoteShake, OEDolJoypadR2, 0},
|
||||
// };
|
||||
//
|
||||
// keymap sideways_keymap[12] = {
|
||||
// {OEWiiMoteButtonLeft, OEDolJoypadUp, 0},
|
||||
// {OEWiiMoteButtonRight, OEDolJoypadDown, 0},
|
||||
// {OEWiiMoteButtonDown, OEDolJoypadLeft, 0},
|
||||
// {OEWiiMoteButtonUp, OEDolJoypadRight, 0},
|
||||
// {OEWiiMoteButtonPlus, OEDolJoypadStart, 0},
|
||||
// {OEWiiMoteButton2, OEDolJoypadB, 0},
|
||||
// {OEWiiMoteButton1, OEDolJoypadA, 0},
|
||||
// {OEWiiMoteButtonB, OEDolJoypadY, 0},
|
||||
// {OEWiiMoteButtonA, OEDolJoypadX, 0},
|
||||
// {OEWiiMoteButtonMinus, OEDolJoypadSelect, 0},
|
||||
// {OEWiiMoteButtonHome, OEDolJoypadR3, 0},
|
||||
// {OEWiiMoteShake, OEDolJoypadR2, 0},
|
||||
//};
|
||||
//
|
||||
// axismap wiimote_tilt_LR;
|
||||
// axismap wiimote_tilt_FB;
|
||||
//
|
||||
// keymap nunchuk_keymap[3] = {
|
||||
// {OEWiiNunchukButtonC, OEDolJoypadL, 0},
|
||||
// {OEWiiNunchukButtonZ, OEDolJoypadR, 0},
|
||||
// {OEWiiNunchukShake, OEDolJoypadL3, 0},
|
||||
// };
|
||||
//
|
||||
// axismap nunchuck_Analog;
|
||||
//
|
||||
// keymap classic_keymap[15] = {
|
||||
// {OEWiiClassicButtonRight, WiimoteEmu::Classic::PAD_RIGHT, 0},
|
||||
// {OEWiiClassicButtonDown, WiimoteEmu::Classic::PAD_DOWN, 0},
|
||||
// {OEWiiClassicButtonL, WiimoteEmu::Classic::TRIGGER_L, 0},
|
||||
// {OEWiiClassicButtonSelect, WiimoteEmu::Classic::BUTTON_MINUS, 0},
|
||||
// {OEWiiClassicButtonHome, WiimoteEmu::Classic::BUTTON_HOME, 0},
|
||||
// {OEWiiClassicButtonStart, WiimoteEmu::Classic::BUTTON_PLUS, 0},
|
||||
// {OEWiiClassicButtonR, WiimoteEmu::Classic::TRIGGER_R, 0},
|
||||
// {OEWiiClassicButtonZl, WiimoteEmu::Classic::BUTTON_ZL, 0},
|
||||
// {OEWiiClassicButtonB, WiimoteEmu::Classic::BUTTON_B, 0},
|
||||
// {OEWiiClassicButtonY, WiimoteEmu::Classic::BUTTON_Y, 0},
|
||||
// {OEWiiClassicButtonX, WiimoteEmu::Classic::BUTTON_X, 0},
|
||||
// {OEWiiClassicButtonA, WiimoteEmu::Classic::BUTTON_A, 0},
|
||||
// {OEWiiClassicButtonZr, WiimoteEmu::Classic::BUTTON_ZR, 0},
|
||||
// {OEWiiClassicButtonLeft, WiimoteEmu::Classic::PAD_LEFT, 0},
|
||||
// {OEWiiClassicButtonUp, WiimoteEmu::Classic::PAD_UP, 0},
|
||||
// };
|
||||
//
|
||||
// axismap classic_AnalogLeft;
|
||||
// axismap classic_AnalogRight;
|
||||
// axismap classic_TriggerLeft;
|
||||
// axismap classic_TriggerRight;
|
||||
//
|
||||
// int extension;
|
||||
// ControlState dx, dy;
|
||||
//
|
||||
//} wii_remote;
|
||||
|
||||
// static gc_pad GameCubePads[4];
|
||||
// static wii_remote WiiRemotes[4];
|
||||
static wii_remote WiiRemotes[4];
|
||||
// static int want_extension[4];
|
||||
|
||||
//void setWiiButton(int pad_num, int button , int value);
|
||||
//void setWiimoteButton(int pad_num, int button , int value);
|
||||
//void setWiiClassicButton(int pad_num, int button , int value);
|
||||
//void setWiiNunchukButton(int pad_num, int button , int value);
|
||||
//
|
||||
//void setWiiAxis(int pad_num, int button , float value);
|
||||
//void setWiimoteAxis(int pad_num, int button , float value);
|
||||
//void setWiiClassicAxis(int pad_num, int button , float value);
|
||||
//void setWiiNunchukAxis(int pad_num, int button , float value);
|
||||
//void setWiiIR(int pad_num, float x , float y);
|
||||
//
|
||||
//int getWiiExtension (int pad_num);
|
||||
void setWiiButton(int pad_num, int button , int value);
|
||||
void setWiiAxis(int pad_num, int button , int value);
|
||||
|
||||
@@ -28,8 +28,6 @@
|
||||
|
||||
#include "DolHost.h"
|
||||
|
||||
extern WindowSystemInfo wsi;
|
||||
|
||||
static Input::openemu_input_state_t input_cb;
|
||||
static Input::openemu_input_poll_t poll_cb;
|
||||
static const std::string source = "OpenEmu";
|
||||
@@ -155,22 +153,22 @@ static unsigned input_types[4];
|
||||
AddButton(OEGCButtonRight, "Right");
|
||||
AddButton(OEGCButtonA, "A");
|
||||
AddButton(OEGCButtonX, "X");
|
||||
AddButton(OEGCButtonL, "L");
|
||||
AddButton(OEGCButtonR, "R");
|
||||
AddButton(OEGCDigitalL, "L");
|
||||
AddButton(OEGCDigitalR, "R");
|
||||
AddButton(OEGCButtonZ, "Z");
|
||||
return;
|
||||
|
||||
case OEDolDevAnalog:
|
||||
AddAxis(OEGCAnalogLeft, -0x8000, "X0-", OEGCAnalog);
|
||||
AddAxis(OEGCAnalogRight, 0x7FFF, "X0+", OEGCAnalog);
|
||||
AddAxis(OEGCAnalogUp, -0x8000, "Y0-", OEGCAnalog);
|
||||
AddAxis(OEGCAnalogDown, 0x7FFF, "Y0+", OEGCAnalog);
|
||||
AddAxis(OEGCAnalogCLeft, -0x8000, "X1-", OEGCAnalogC);
|
||||
AddAxis(OEGCAnalogCRight, 0x7FFF, "X1+", OEGCAnalogC);
|
||||
AddAxis(OEGCAnalogCUp, -0x8000, "Y1-", OEGCAnalogC);
|
||||
AddAxis(OEGCAnalogCDown, 0x7FFF, "Y1+", OEGCAnalogC);
|
||||
AddAxis(OEDolJoypadL2, 0x7FFF, "Trigger0+", OEGCAnalogTrigger);
|
||||
AddAxis(OEDolJoypadR2, 0x7FFF, "Trigger1+", OEGCAnalogTrigger);
|
||||
AddAxis(OEGCAnalogLeft, -0x8000, "X0-");
|
||||
AddAxis(OEGCAnalogRight, 0x7FFF, "X0+");
|
||||
AddAxis(OEGCAnalogUp, -0x8000, "Y0-");
|
||||
AddAxis(OEGCAnalogDown, 0x7FFF, "Y0+");
|
||||
AddAxis(OEGCAnalogCLeft, -0x8000, "X1-");
|
||||
AddAxis(OEGCAnalogCRight, 0x7FFF, "X1+");
|
||||
AddAxis(OEGCAnalogCUp, -0x8000, "Y1-");
|
||||
AddAxis(OEGCAnalogCDown, 0x7FFF, "Y1+");
|
||||
AddAxis(OEGCButtonL, 0x7FFF, "Trigger0+");
|
||||
AddAxis(OEGCButtonR, 0x7FFF, "Trigger1+");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -234,7 +232,7 @@ void Input::openemu_set_input_poll(Input::openemu_input_poll_t cb)
|
||||
|
||||
void Input::openemu_set_controller_port_device(unsigned port, unsigned device)
|
||||
{
|
||||
if (port > 3)
|
||||
if (port > 4)
|
||||
return;
|
||||
|
||||
input_types[port] = device;
|
||||
|
||||
@@ -9,80 +9,23 @@ typedef enum _OEDolDev
|
||||
OEDolDevPointer
|
||||
} OEDolDevs;
|
||||
|
||||
typedef enum _OEDolJoyControls
|
||||
typedef enum _OEGCDigital
|
||||
{
|
||||
OEDolJoypadB,
|
||||
OEDolJoypadY,
|
||||
OEDolJoypadSelect,
|
||||
OEDolJoypadStart,
|
||||
OEDolJoypadUp,
|
||||
OEDolJoypadDown,
|
||||
OEDolJoypadLeft,
|
||||
OEDolJoypadRight,
|
||||
OEDolJoypadA,
|
||||
OEDolJoypadX,
|
||||
OEDolJoypadL,
|
||||
OEDolJoypadR,
|
||||
OEDolJoypadL2,
|
||||
OEDolJoypadR2,
|
||||
OEDolJoypadL3,
|
||||
OEDolJoypadR3
|
||||
} OEDolJoyControls;
|
||||
OEGCDigitalL = 21,
|
||||
OEGCDigitalR
|
||||
} OEGCDigital;
|
||||
|
||||
typedef enum _OEGCAnalogControls
|
||||
{
|
||||
OEGCAnalog,
|
||||
OEGCAnalogC,
|
||||
OEGCAnalogTrigger
|
||||
} OEGCAnalogContols;
|
||||
|
||||
typedef enum _OEDolAnalogAxis
|
||||
{
|
||||
OEDolAnalogX,
|
||||
OEDolAnalogY
|
||||
} OEDolAnalogAxis;
|
||||
|
||||
typedef enum _OEGCAxis
|
||||
{
|
||||
OEGCAnalogX,
|
||||
OEGCAnalogY,
|
||||
OEGCAnalogCX,
|
||||
OEGCAnalogCY,
|
||||
OEGCAxisCount
|
||||
} OEGCAxis;
|
||||
|
||||
typedef enum _OEWiimote
|
||||
typedef enum _OEWiiConYype
|
||||
{
|
||||
OEWiimote = 1,
|
||||
OEWiimoteSW,
|
||||
OEWiimoteNC,
|
||||
OEWiimoteCC,
|
||||
OEWiiMoteReal
|
||||
} OEWiiController;
|
||||
} OEWiiConType;
|
||||
|
||||
namespace Input
|
||||
{
|
||||
struct openemu_controller_description
|
||||
{
|
||||
const char *desc;
|
||||
unsigned id;
|
||||
};
|
||||
|
||||
struct openemu_controller_info
|
||||
{
|
||||
const struct openemu_controller_description *types;
|
||||
unsigned num_types;
|
||||
};
|
||||
|
||||
struct openemu_input_descriptor
|
||||
{
|
||||
unsigned port;
|
||||
unsigned device;
|
||||
unsigned index;
|
||||
unsigned id;
|
||||
const char *description;
|
||||
};
|
||||
|
||||
typedef int16_t (*openemu_input_state_t)(unsigned port, unsigned device, unsigned index, unsigned id);
|
||||
typedef void (*openemu_input_poll_t)();
|
||||
|
||||
|
||||
@@ -65,6 +65,7 @@ public:
|
||||
void volumeUp();
|
||||
void SetVolume(float value);
|
||||
void DisplayMessage(std::string message);
|
||||
float GetFrameInterval();
|
||||
|
||||
bool SaveState(std::string saveStateFile);
|
||||
bool LoadState(std::string saveStateFile);
|
||||
|
||||
+19
-59
@@ -84,8 +84,8 @@ static Common::Flag s_running{true};
|
||||
static Common::Flag s_shutdown_requested{false};
|
||||
static Common::Flag s_tried_graceful_shutdown{false};
|
||||
|
||||
static std::unique_ptr<Platform> s_platform;
|
||||
|
||||
WindowSystemInfo wsi(WindowSystemType::Headless, nullptr, nullptr);
|
||||
|
||||
DolHost* DolHost::GetInstance()
|
||||
{
|
||||
if (DolHost::m_instance == nullptr)
|
||||
@@ -137,7 +137,7 @@ void DolHost::Init(std::string supportDirectoryPath, std::string cpath)
|
||||
SConfig::GetInstance().m_Volume = 0;
|
||||
|
||||
//Split CPU thread from GPU
|
||||
SConfig::GetInstance().bCPUThread = false;
|
||||
SConfig::GetInstance().bCPUThread = true;
|
||||
|
||||
//Analitics
|
||||
SConfig::GetInstance().m_analytics_permission_asked = true;
|
||||
@@ -202,8 +202,6 @@ void DolHost::Init(std::string supportDirectoryPath, std::string cpath)
|
||||
# pragma mark - Execution
|
||||
bool DolHost::LoadFileAtPath()
|
||||
{
|
||||
s_platform = Platform::CreateHeadlessPlatform();
|
||||
|
||||
Core::SetOnStateChangedCallback([](Core::State state) {
|
||||
if (state == Core::State::Uninitialized)
|
||||
s_running.Clear();
|
||||
@@ -215,9 +213,8 @@ bool DolHost::LoadFileAtPath()
|
||||
// WiiUtils::InstallWAD(_gamePath);
|
||||
// // else
|
||||
// // WiiUtils::DoDiscUpdate(nil, _gameRegionName);
|
||||
|
||||
|
||||
if (!BootManager::BootCore(BootParameters::GenerateFromFile(_gamePath), s_platform->GetWindowSystemInfo()))
|
||||
|
||||
if (!BootManager::BootCore(BootParameters::GenerateFromFile(_gamePath), wsi))
|
||||
return false;
|
||||
|
||||
// Initialize Input
|
||||
@@ -265,9 +262,9 @@ void DolHost::Reset()
|
||||
|
||||
void DolHost::UpdateFrame()
|
||||
{
|
||||
Core::HostDispatchJobs();
|
||||
//Core::HostDispatchJobs();
|
||||
|
||||
// Input::OpenEmu_Input_Update();
|
||||
//Input::OpenEmu_Input_Update();
|
||||
|
||||
if(_onBoot) _onBoot = false;
|
||||
}
|
||||
@@ -284,11 +281,6 @@ bool DolHost::CoreRunning()
|
||||
void DolHost::SetPresentationFBO(int RenderFBO)
|
||||
{
|
||||
g_Config.iRenderFBO = RenderFBO;
|
||||
g_Config.bCrop = false;
|
||||
g_Config.bWidescreenHack = false;
|
||||
g_Config.bHiresTextures = false;
|
||||
g_Config.bSSAA = false;
|
||||
g_Config.iEFBScale = 2;
|
||||
}
|
||||
|
||||
void DolHost::SetBackBufferSize(int width, int height) {
|
||||
@@ -483,28 +475,6 @@ void DolHost::setButtonState(int button, int state, int player)
|
||||
{
|
||||
// setWiiButton(player, button, state);
|
||||
}
|
||||
|
||||
// if (button == OEWiiChangeExtension)
|
||||
// {
|
||||
// //set the Extension change state and return. The next key pressed
|
||||
// // while the Change Extension key is held will determine the Extension added
|
||||
// _wiiChangeExtension[player] = state;
|
||||
// return;
|
||||
// }
|
||||
|
||||
// if ( _wiiChangeExtension[player] && state == 1)
|
||||
// {
|
||||
// if ( button <= OEWiiMoteSwingBackward ) {
|
||||
// changeWiimoteExtension(WiimoteEmu::EXT_NONE, player);
|
||||
// Core::DisplayMessage("Extenstion Removed", 1500);
|
||||
// } else if (button <= OEWiiNunchuckButtonZ ) {
|
||||
// changeWiimoteExtension(WiimoteEmu::EXT_NUNCHUK, player);
|
||||
// Core::DisplayMessage("Nunchuk Connected", 1500);
|
||||
// } else if (button <= OEWiiClassicButtonHome ) {
|
||||
// changeWiimoteExtension(WiimoteEmu::EXT_CLASSIC, player);
|
||||
// Core::DisplayMessage("Classic Controller Connected", 1500);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
void DolHost::SetAxis(int button, float value, int player)
|
||||
@@ -513,6 +483,11 @@ void DolHost::SetAxis(int button, float value, int player)
|
||||
|
||||
if (_gameType == DiscIO::Platform::GameCubeDisc) {
|
||||
setGameCubeAxis(player, button, value);
|
||||
if (button == OEGCButtonR || button == OEGCButtonL) {
|
||||
int digVal = 0;
|
||||
if (value == 1) digVal = 1;
|
||||
setGameCubeButton(player, button + 5, digVal);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -549,6 +524,11 @@ void DolHost::GetGameInfo()
|
||||
_gameType = pVolume->GetVolumeType();
|
||||
}
|
||||
|
||||
float DolHost::GetFrameInterval()
|
||||
{
|
||||
return DiscIO::IsNTSC(SConfig::GetInstance().m_region) ? (60.0f / 1.001f) : 50.0f;
|
||||
}
|
||||
|
||||
std::string DolHost::GetNameOfRegion(DiscIO::Region region)
|
||||
{
|
||||
switch (region)
|
||||
@@ -603,33 +583,13 @@ std::string DolHost::GetDirOfCountry(DiscIO::Country country)
|
||||
|
||||
WindowSystemInfo DolHost::GetWSI()
|
||||
{
|
||||
return s_platform->GetWindowSystemInfo();
|
||||
return wsi;
|
||||
}
|
||||
|
||||
# pragma mark - Dolphin Host callbacks
|
||||
void Host_NotifyMapLoaded() {}
|
||||
void Host_RefreshDSPDebuggerWindow() {}
|
||||
void Host_Message(HostMessageID id) {
|
||||
if ( id == HostMessageID::WMUserCreate ) {
|
||||
#ifdef DEBUG
|
||||
//We have to set FPS display here or it doesn't work
|
||||
g_Config.bShowFPS = true;
|
||||
Core::SetState(Core::State::Running);
|
||||
#endif
|
||||
|
||||
// Set the aspect to stretch
|
||||
g_Config.aspect_mode = AspectMode::Stretch;
|
||||
|
||||
// Core is up, lets enable Hybric Ubershaders
|
||||
g_Config.iShaderCompilationMode = ShaderCompilationMode::AsynchronousUberShaders;
|
||||
g_Config.bWaitForShadersBeforeStarting = false;
|
||||
|
||||
//Set the threads to auto (-1)
|
||||
g_Config.iShaderCompilerThreads = -1;
|
||||
g_Config.iShaderPrecompilerThreads = -1;
|
||||
|
||||
}
|
||||
}
|
||||
void Host_Message(HostMessageID id) {}
|
||||
void* Host_GetRenderHandle() { return (void *)-1; }
|
||||
void Host_UpdateTitle(const std::string&) {}
|
||||
void Host_UpdateDisasmDialog() {}
|
||||
|
||||
+3
-3
@@ -99,7 +99,6 @@ extern std::unique_ptr<SoundStream> g_sound_stream;
|
||||
{
|
||||
_dolphinCoreModule = @"gc";
|
||||
_isWii = false;
|
||||
_frameInterval = 60;
|
||||
_dolphinCoreAspect = OEIntSizeMake(4, 3);
|
||||
_dolphinCoreScreen = OEIntSizeMake(640, 480);
|
||||
}
|
||||
@@ -107,7 +106,6 @@ extern std::unique_ptr<SoundStream> g_sound_stream;
|
||||
{
|
||||
_dolphinCoreModule = @"Wii";
|
||||
_isWii = true;
|
||||
_frameInterval = 60;
|
||||
_dolphinCoreAspect = OEIntSizeMake(16,9);
|
||||
_dolphinCoreScreen = OEIntSizeMake(854, 480);
|
||||
}
|
||||
@@ -144,7 +142,9 @@ extern std::unique_ptr<SoundStream> g_sound_stream;
|
||||
|
||||
if(dol_host->LoadFileAtPath())
|
||||
_isInitialized = true;
|
||||
|
||||
|
||||
_frameInterval = dol_host->GetFrameInterval();
|
||||
|
||||
}
|
||||
[super startEmulation];
|
||||
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.openemu.${PRODUCT_NAME:identifier}</string>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>5.0.1</string>
|
||||
<string>5.0.2</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>OEGameCoreController</string>
|
||||
<key>OEGameCoreClass</key>
|
||||
|
||||
@@ -96,7 +96,6 @@
|
||||
/* Begin PBXBuildFile section */
|
||||
3E0A56EE1FAF7EDC00D755B8 /* VideoConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D75E31C82B2DE00091C4D /* VideoConfig.cpp */; };
|
||||
3E0BD1281F8E89D30037C92D /* Core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71AA1C82B0F800091C4D /* Core.cpp */; };
|
||||
3E0BD12A1F8E8E2E0037C92D /* FileUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6EF0EE1C98C8C7004C6F58 /* FileUtil.cpp */; };
|
||||
3E1DDEC81D74AC1E00BB8009 /* OEWiiSystemController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E22178A1D74A83E00C55942 /* OEWiiSystemController.m */; };
|
||||
3E1DDEC91D74AC1E00BB8009 /* OEWiiSystemResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E22178C1D74A83E00C55942 /* OEWiiSystemResponder.m */; };
|
||||
3E1DDECA1D74AC2E00BB8009 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 834974241A643EBC00E0B28E /* Cocoa.framework */; };
|
||||
@@ -725,7 +724,6 @@
|
||||
3EFF262C1F8458E600B4FD11 /* UberShaderCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26211F8458E500B4FD11 /* UberShaderCommon.cpp */; };
|
||||
3EFF26411F845CA500B4FD11 /* SYSCONFSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF262E1F845CA400B4FD11 /* SYSCONFSettings.cpp */; };
|
||||
3EFF26421F845CA500B4FD11 /* NetplaySettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26311F845CA400B4FD11 /* NetplaySettings.cpp */; };
|
||||
3EFF26431F845CA500B4FD11 /* GraphicsSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26331F845CA400B4FD11 /* GraphicsSettings.cpp */; };
|
||||
3EFF26441F845CA500B4FD11 /* MainSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26341F845CA400B4FD11 /* MainSettings.cpp */; };
|
||||
3EFF26451F845CA500B4FD11 /* NetPlayConfigLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26381F845CA500B4FD11 /* NetPlayConfigLoader.cpp */; };
|
||||
3EFF26461F845CA500B4FD11 /* MovieConfigLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26391F845CA500B4FD11 /* MovieConfigLoader.cpp */; };
|
||||
@@ -1008,6 +1006,8 @@
|
||||
EE8DD2ED224A8058005E1AF5 /* libimgui-dol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE8DD27222492AAB005E1AF5 /* libimgui-dol.a */; };
|
||||
EE9C006C20A4F94000312609 /* Watches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE9C006920A4F93F00312609 /* Watches.cpp */; };
|
||||
EE9C007020A4FA8C00312609 /* SysConf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE9C006E20A4FA8B00312609 /* SysConf.cpp */; };
|
||||
EE9E292D23BCF8F700EFD1A8 /* FileUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6EF0EE1C98C8C7004C6F58 /* FileUtil.cpp */; };
|
||||
EE9E292E23BCF90B00EFD1A8 /* GraphicsSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE9E292B23BCF8DB00EFD1A8 /* GraphicsSettings.cpp */; };
|
||||
EEA7CF5E20A4F2DE0033BB8A /* FloatUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA7CF5D20A4F2DE0033BB8A /* FloatUtils.cpp */; };
|
||||
EEC2B7B623B2B29B006E959C /* Layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEC2B7B523B2B139006E959C /* Layer.cpp */; };
|
||||
EEC94A5C224ABFDC00F85ABA /* OpenEmuBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E3D774A1C83DC9000091C4D /* OpenEmuBase.framework */; };
|
||||
@@ -3474,6 +3474,7 @@
|
||||
EE9C006920A4F93F00312609 /* Watches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watches.cpp; sourceTree = "<group>"; };
|
||||
EE9C006E20A4FA8B00312609 /* SysConf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SysConf.cpp; path = dolphin/Source/Core/Core/SysConf.cpp; sourceTree = "<group>"; };
|
||||
EE9C006F20A4FA8C00312609 /* SysConf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SysConf.h; path = dolphin/Source/Core/Core/SysConf.h; sourceTree = "<group>"; };
|
||||
EE9E292B23BCF8DB00EFD1A8 /* GraphicsSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GraphicsSettings.cpp; path = Core/GraphicsSettings.cpp; sourceTree = "<group>"; };
|
||||
EEA7CF5B20A4F2DD0033BB8A /* FloatUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FloatUtils.h; path = dolphin/Source/Core/Common/FloatUtils.h; sourceTree = "<group>"; };
|
||||
EEA7CF5C20A4F2DD0033BB8A /* Result.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Result.h; path = dolphin/Source/Core/Common/Result.h; sourceTree = "<group>"; };
|
||||
EEA7CF5D20A4F2DE0033BB8A /* FloatUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FloatUtils.cpp; path = dolphin/Source/Core/Common/FloatUtils.cpp; sourceTree = "<group>"; };
|
||||
@@ -3830,6 +3831,7 @@
|
||||
3E3D70241C82AF0600091C4D /* Compatibilty */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
EE9E292C23BCF8E600EFD1A8 /* Core */,
|
||||
3E89F47A1CCAB2A800EAE7AC /* Common */,
|
||||
3E89F4771CCA7A1600EAE7AC /* Input */,
|
||||
3E89F4761CCA7A0D00EAE7AC /* Video */,
|
||||
@@ -4443,9 +4445,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
EEC2B7B523B2B139006E959C /* Layer.cpp */,
|
||||
EEE07D4222C43C52006D46FD /* ConfigManager.cpp */,
|
||||
EEA7CF5F20A4F70B0033BB8A /* scmrev.h */,
|
||||
3E6EF0EE1C98C8C7004C6F58 /* FileUtil.cpp */,
|
||||
);
|
||||
name = Common;
|
||||
sourceTree = "<group>";
|
||||
@@ -6948,6 +6948,16 @@
|
||||
path = dolphin/Source/Core/Common/Debug;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
EE9E292C23BCF8E600EFD1A8 /* Core */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3E6EF0EE1C98C8C7004C6F58 /* FileUtil.cpp */,
|
||||
EEE07D4222C43C52006D46FD /* ConfigManager.cpp */,
|
||||
EE9E292B23BCF8DB00EFD1A8 /* GraphicsSettings.cpp */,
|
||||
);
|
||||
name = Core;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
EEC94A4E224ABFD200F85ABA /* OGLCompilersDLL */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -7977,7 +7987,6 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
EE6ABEC0239C78AE005E5F7D /* TitleContents.cpp in Sources */,
|
||||
3EFF26431F845CA500B4FD11 /* GraphicsSettings.cpp in Sources */,
|
||||
3E8EC66A1F8434AA00D79F27 /* EXI_DeviceEthernet.cpp in Sources */,
|
||||
EE149BA7205A270F008D5DDE /* DSPJitCCUtil.cpp in Sources */,
|
||||
3E89F47D1CCAB4FC00EAE7AC /* State.cpp in Sources */,
|
||||
@@ -8133,6 +8142,7 @@
|
||||
3EFF26FF1F845E9F00B4FD11 /* SignatureDB.cpp in Sources */,
|
||||
3E3D740A1C82B0F900091C4D /* JitAsm.cpp in Sources */,
|
||||
3E3D73CA1C82B0F900091C4D /* SystemTimers.cpp in Sources */,
|
||||
EE9E292D23BCF8F700EFD1A8 /* FileUtil.cpp in Sources */,
|
||||
3E3D74331C82B0F900091C4D /* PPCSymbolDB.cpp in Sources */,
|
||||
3E3D735F1C82B0F900091C4D /* CoreTiming.cpp in Sources */,
|
||||
3E3D73931C82B0F900091C4D /* CPU.cpp in Sources */,
|
||||
@@ -8179,6 +8189,7 @@
|
||||
3E3D739B1C82B0F900091C4D /* INIT.cpp in Sources */,
|
||||
3E3D73FD1C82B0F900091C4D /* Interpreter_Paired.cpp in Sources */,
|
||||
3E3D73841C82B0F900091C4D /* FifoDataFile.cpp in Sources */,
|
||||
EE9E292E23BCF90B00EFD1A8 /* GraphicsSettings.cpp in Sources */,
|
||||
3E8EC65A1F8434AA00D79F27 /* DVDMath.cpp in Sources */,
|
||||
3E0BD1281F8E89D30037C92D /* Core.cpp in Sources */,
|
||||
EE9C007020A4FA8C00312609 /* SysConf.cpp in Sources */,
|
||||
@@ -8310,7 +8321,6 @@
|
||||
3E3D71741C82B0BB00091C4D /* GLUtil.cpp in Sources */,
|
||||
3E3D71761C82B0BB00091C4D /* IniFile.cpp in Sources */,
|
||||
3E3D71931C82B0BB00091C4D /* x64CPUDetect.cpp in Sources */,
|
||||
3E0BD12A1F8E8E2E0037C92D /* FileUtil.cpp in Sources */,
|
||||
EE9C006C20A4F94000312609 /* Watches.cpp in Sources */,
|
||||
3E3D71751C82B0BB00091C4D /* Hash.cpp in Sources */,
|
||||
3E3D71871C82B0BB00091C4D /* SettingsHandler.cpp in Sources */,
|
||||
@@ -13247,6 +13257,7 @@
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
|
||||
@@ -13281,6 +13292,7 @@
|
||||
"$(inherited)",
|
||||
"$(SRCROOT)/dolphin",
|
||||
);
|
||||
LLVM_LTO = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
@@ -13363,6 +13375,7 @@
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
|
||||
@@ -13397,6 +13410,7 @@
|
||||
"$(inherited)",
|
||||
"$(SRCROOT)/dolphin",
|
||||
);
|
||||
LLVM_LTO = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
@@ -14735,14 +14749,15 @@
|
||||
$SRCROOT/dolphin/Externals/hidapi/hidapi,
|
||||
);
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
|
||||
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(PROJECT_DIR)/Externals/ffmpeg/lib",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:identifier}";
|
||||
PRODUCT_NAME = dolphin;
|
||||
SDKROOT = macosx;
|
||||
SKIP_INSTALL = YES;
|
||||
WRAPPER_EXTENSION = oecoreplugin;
|
||||
@@ -14816,14 +14831,15 @@
|
||||
$SRCROOT/dolphin/Externals/hidapi/hidapi,
|
||||
);
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
|
||||
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(PROJECT_DIR)/Externals/ffmpeg/lib",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:identifier}";
|
||||
PRODUCT_NAME = dolphin;
|
||||
SDKROOT = macosx;
|
||||
SKIP_INSTALL = YES;
|
||||
WRAPPER_EXTENSION = oecoreplugin;
|
||||
@@ -14897,14 +14913,15 @@
|
||||
$SRCROOT/dolphin/Externals/hidapi/hidapi,
|
||||
);
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
|
||||
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(PROJECT_DIR)/Externals/ffmpeg/lib",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:identifier}";
|
||||
PRODUCT_NAME = dolphin;
|
||||
SDKROOT = macosx;
|
||||
SKIP_INSTALL = YES;
|
||||
WRAPPER_EXTENSION = oecoreplugin;
|
||||
@@ -14978,14 +14995,15 @@
|
||||
$SRCROOT/dolphin/Externals/hidapi/hidapi,
|
||||
);
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
|
||||
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(PROJECT_DIR)/Externals/ffmpeg/lib",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:identifier}";
|
||||
PRODUCT_NAME = dolphin;
|
||||
SDKROOT = macosx;
|
||||
SKIP_INSTALL = YES;
|
||||
WRAPPER_EXTENSION = oecoreplugin;
|
||||
@@ -19721,6 +19739,7 @@
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
|
||||
@@ -19755,6 +19774,7 @@
|
||||
"$(inherited)",
|
||||
"$(SRCROOT)/dolphin",
|
||||
);
|
||||
LLVM_LTO = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
@@ -19980,6 +20000,7 @@
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
@@ -20013,6 +20034,7 @@
|
||||
"$(inherited)",
|
||||
"$(SRCROOT)/dolphin",
|
||||
);
|
||||
LLVM_LTO = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.14;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
|
||||
Reference in New Issue
Block a user