ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check in citra dll/so, add in build scripts/linux glslangValidator for citra, some minor cleanup handling with citra input handling

This commit is contained in:
CasualPokePlayer 2023-07-29 15:09:17 -07:00
parent ff6834617f
commit e62c972ca3
10 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/citra-headless.dll Normal file
View File

Binary file not shown.

BIN
Assets/dll/libcitra-headless.so Normal file
View File

Binary file not shown.

7
citra/build_release.bat
View File

@ -6,7 +6,6 @@ cmake ..\citra -DENABLE_SDL2=OFF -DUSE_SYSTEM_SDL2=OFF -DENABLE_QT=OFF -DENABLE_
-DENABLE_TESTS=OFF -DENABLE_DEDICATED_ROOM=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_CUBEB=OFF -DENABLE_OPENAL=OFF ^ -DENABLE_TESTS=OFF -DENABLE_DEDICATED_ROOM=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_CUBEB=OFF -DENABLE_OPENAL=OFF ^
-DENABLE_LIBUSB=OFF -DUSE_DISCORD_PRESENCE=OFF -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_LIBUSB=OFF ^ -DENABLE_LIBUSB=OFF -DUSE_DISCORD_PRESENCE=OFF -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_LIBUSB=OFF ^
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DENABLE_HEADLESS=ON -DCMAKE_PROGRAM_PATH=%GLSLANG_VALIDATOR_DIR% ^ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DENABLE_HEADLESS=ON -DCMAKE_PROGRAM_PATH=%GLSLANG_VALIDATOR_DIR% ^
-DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=ON -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -G Ninja
:: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -G Ninja ninja
::ninja cd ..
::cd ..

12
citra/build_release.sh Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
rm -rf build
mkdir build
export GLSLANG_VALIDATOR_DIR=$(realpath ./glslangValidator)
cd build
cmake ../citra -DENABLE_SDL2=OFF -DUSE_SYSTEM_SDL2=OFF -DENABLE_QT=OFF -DENABLE_QT_TRANSLATION=OFF -DENABLE_QT_UPDATER=OFF \
-DENABLE_TESTS=OFF -DENABLE_DEDICATED_ROOM=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_CUBEB=OFF -DENABLE_OPENAL=OFF \
-DENABLE_LIBUSB=OFF -DUSE_DISCORD_PRESENCE=OFF -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_LIBUSB=OFF \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DENABLE_HEADLESS=ON -DCMAKE_PROGRAM_PATH=$GLSLANG_VALIDATOR_DIR \
-DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wno-deprecated" -G Ninja
ninja

2
citra/citra

@ -1 +1 @@
Subproject commit 7db8fc2aa41595d1e3393dae2c0f61635d4617e5 Subproject commit 663a9bc6b59ea3bda50a1e55007bd46357fcfc85

BIN
citra/glslangValidator/glslangValidator Normal file
View File

Binary file not shown.

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IEmulator.cs
View File

@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
controller.AxisValue("Tilt X"), controller.AxisValue("Tilt X"),
controller.AxisValue("Tilt Y")); controller.AxisValue("Tilt Y"));
if (_controller.IsPressed("Power")) if (_controller.IsPressed("Reset"))
{ {
_core.Citra_Reset(_context); _core.Citra_Reset(_context);
} }

5
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IInputPollable.cs
View File

@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{ {
BoolButtons = BoolButtons =
{ {
"A", "B", "X", "Y", "Up", "Down", "Left", "Right", "L", "R", "Start", "Select", "Debug", "GPIO14", "ZL", "ZR", "Home", "Touch", "Tilt", "Power" "A", "B", "X", "Y", "Up", "Down", "Left", "Right", "L", "R", "Start", "Select", "Debug", "GPIO14", "ZL", "ZR", "Touch", "Tilt", "Reset"
} }
}.AddXYPair("Circle Pad {0}", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0) }.AddXYPair("Circle Pad {0}", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0)
.AddXYPair("C-Stick {0}", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0) .AddXYPair("C-Stick {0}", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0)
@ -45,7 +45,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
LibCitra.Buttons.Gpio14 => _controller.IsPressed("GPIO14"), LibCitra.Buttons.Gpio14 => _controller.IsPressed("GPIO14"),
LibCitra.Buttons.ZL => _controller.IsPressed("ZL"), LibCitra.Buttons.ZL => _controller.IsPressed("ZL"),
LibCitra.Buttons.ZR => _controller.IsPressed("ZR"), LibCitra.Buttons.ZR => _controller.IsPressed("ZR"),
LibCitra.Buttons.Home => _controller.IsPressed("Home"), LibCitra.Buttons.Home => false, // not supported (can only be used if Home menu is booted, which is never be the case for us)
LibCitra.Buttons.Power => false, // not supported (can only be used if Home menu is booted, which is never be the case for us)
_ => throw new InvalidOperationException(), _ => throw new InvalidOperationException(),
}; };

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs
View File

@ -11,7 +11,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{ {
[PortedCore(CoreNames.Citra, "Citra Emulator Project", "nightly-1953", "https://citra-emu.org", singleInstance: true, isReleased: false)] [PortedCore(CoreNames.Citra, "Citra Emulator Project", "nightly-1957", "https://citra-emu.org", singleInstance: true, isReleased: false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })] [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })]
public partial class Citra public partial class Citra
{ {

7
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibCitra.cs
View File

@ -70,6 +70,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
ZL, ZL,
ZR, ZR,
Home, Home,
Power,
} }
public enum AnalogSticks public enum AnalogSticks
@ -78,12 +79,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
CStick, CStick,
} }
public enum Axes
{
X,
Y
}
[UnmanagedFunctionPointer(cc)] [UnmanagedFunctionPointer(cc)]
public delegate bool GetButtonCallback(Buttons button); public delegate bool GetButtonCallback(Buttons button);