Emulation/primehack
1
0
Fork 0
mirror of https://github.com/Kekun/primehack.git synced 2024-05-09 17:03:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix building on windows

Browse source
This commit is contained in:
vyuuui 2022-10-17 19:00:41 -07:00
parent c5face1361
commit ee356b3cca
9 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -32,3 +32,6 @@
url = https://github.com/randy408/libspng.git
branch = v0.7.2
shallow = true
[submodule "Externals/Qt"]
path = Externals/Qt
url = https://github.com/dolphin-emu/ext-win-qt.git

1
Externals/imgui/imgui.vcxproj vendored
View file

@ -19,6 +19,7 @@
<ClCompile>
<!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
<AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>

2
Externals/mGBA/mgba.vcxproj vendored
View file

@ -18,7 +18,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>mgba\include;mgba\src;mgba\src\third-party\lzma;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;DISABLE_THREADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PreBuildEvent>
<Command>"$(CScript)" /nologo /E:JScript "make_version.c.js"</Command>

5
Source/Core/Core/PrimeHack/Mods/STRGPatch.cpp
View file

@ -5,7 +5,8 @@ namespace prime {
namespace {
std::string readin_str(u32 str_ptr) {
std::ostringstream key_readin;
for (char c; (c = read8(str_ptr)); str_ptr++) {
for (char c = read8(str_ptr); c; c = read8(++str_ptr)) {
key_readin << c;
}
return key_readin.str();
@ -77,7 +78,7 @@ void STRGPatch::run_mod(Game game, Region region) {
void STRGPatch::run_mod_mp3() {
char str[] = "&just=center;Mash Jump [&image=0x5FC17B1F30BAA7AE;] to shake off Gandrayda!";
for (size_t i = 0; i < sizeof(str); i++) {
write8(str[i], replace_string_addr + i);
write8(str[i], replace_string_addr + static_cast<u32>(i));
}
}

4
Source/Core/DolphinLib.vcxproj
View file

@ -51,6 +51,7 @@
<ClCompile Include="Core\PrimeHack\Mods\PortalSkipMP2.cpp" />
<ClCompile Include="Core\PrimeHack\Mods\BloomIntensityMP3.cpp" />
<ClCompile Include="Core\PrimeHack\Mods\SpringballButton.cpp" />
<ClCompile Include="Core\PrimeHack\Mods\STRGPatch.cpp" />
<ClCompile Include="Core\PrimeHack\Mods\ViewModifier.cpp" />
<ClCompile Include="Core\PrimeHack\PrimeMod.cpp" />
<ClCompile Include="Core\PrimeHack\PrimeUtils.cpp" />
@ -83,6 +84,7 @@
<ClInclude Include="Core\PrimeHack\Mods\RestoreDashing.h" />
<ClInclude Include="Core\PrimeHack\Mods\SkipCutscene.h" />
<ClInclude Include="Core\PrimeHack\Mods\SpringballButton.h" />
<ClInclude Include="Core\PrimeHack\Mods\STRGPatch.h" />
<ClInclude Include="Core\PrimeHack\Mods\ViewModifier.h" />
<ClInclude Include="Core\PrimeHack\PrimeMod.h" />
<ClInclude Include="Core\PrimeHack\PrimeUtils.h" />
@ -126,4 +128,4 @@
<Import Project="$(ExternalsDir)zstd\exports.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>

5
Source/Core/DolphinQt/Config/PrimeCheatsWidget.cpp
View file

@ -119,8 +119,3 @@ void PrimeCheatsWidget::showEvent(QShowEvent*)
{
OnLoadConfig();
}
void PrimeCheatsWidget::enterEvent(QEvent*)
{
OnLoadConfig();
}

1
Source/Core/DolphinQt/Config/PrimeCheatsWidget.h
View file

@ -9,7 +9,6 @@ class PrimeCheatsWidget : public QWidget
public:
explicit PrimeCheatsWidget();
protected:
void enterEvent(QEvent*);
void showEvent(QShowEvent*);
private:
void CreateWidgets();

3
Source/Core/DolphinQt/DolphinQt.vcxproj
View file

@ -31,15 +31,14 @@
<AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!--Jump through some hoops to generate a pch file local to this project-->
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
</ClCompile>
<Manifest>
<AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

4
Source/Core/DolphinQt/RenderWidget.cpp
View file

@ -543,8 +543,8 @@ void RenderWidget::PassEventToImGui(const QEvent* event)
if (Config::Get(Config::PRIMEHACK_ENABLE))
{
int x = static_cast<const QMouseEvent*>(event)->x();
int y = static_cast<const QMouseEvent*>(event)->y();
int x = static_cast<const QMouseEvent*>(event)->position().x();
int y = static_cast<const QMouseEvent*>(event)->position().y();
prime::g_mouse_input->mousePressEvent(x, y);
}