mirror of
https://github.com/Retropex/dolphin.git
synced 2025-05-12 19:30:44 +02:00
Fix building on windows
This commit is contained in:
parent
c5face1361
commit
ee356b3cca
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -32,3 +32,6 @@
|
|||||||
url = https://github.com/randy408/libspng.git
|
url = https://github.com/randy408/libspng.git
|
||||||
branch = v0.7.2
|
branch = v0.7.2
|
||||||
shallow = true
|
shallow = true
|
||||||
|
[submodule "Externals/Qt"]
|
||||||
|
path = Externals/Qt
|
||||||
|
url = https://github.com/dolphin-emu/ext-win-qt.git
|
||||||
|
1
Externals/imgui/imgui.vcxproj
vendored
1
Externals/imgui/imgui.vcxproj
vendored
@ -19,6 +19,7 @@
|
|||||||
<ClCompile>
|
<ClCompile>
|
||||||
<!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
|
<!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
|
||||||
<AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
2
Externals/mGBA/mgba.vcxproj
vendored
2
Externals/mGBA/mgba.vcxproj
vendored
@ -18,7 +18,7 @@
|
|||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>mgba\include;mgba\src;mgba\src\third-party\lzma;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<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>
|
</ClCompile>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Command>"$(CScript)" /nologo /E:JScript "make_version.c.js"</Command>
|
<Command>"$(CScript)" /nologo /E:JScript "make_version.c.js"</Command>
|
||||||
|
@ -5,7 +5,8 @@ namespace prime {
|
|||||||
namespace {
|
namespace {
|
||||||
std::string readin_str(u32 str_ptr) {
|
std::string readin_str(u32 str_ptr) {
|
||||||
std::ostringstream key_readin;
|
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;
|
key_readin << c;
|
||||||
}
|
}
|
||||||
return key_readin.str();
|
return key_readin.str();
|
||||||
@ -77,7 +78,7 @@ void STRGPatch::run_mod(Game game, Region region) {
|
|||||||
void STRGPatch::run_mod_mp3() {
|
void STRGPatch::run_mod_mp3() {
|
||||||
char str[] = "&just=center;Mash Jump [&image=0x5FC17B1F30BAA7AE;] to shake off Gandrayda!";
|
char str[] = "&just=center;Mash Jump [&image=0x5FC17B1F30BAA7AE;] to shake off Gandrayda!";
|
||||||
for (size_t i = 0; i < sizeof(str); i++) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@
|
|||||||
<ClCompile Include="Core\PrimeHack\Mods\PortalSkipMP2.cpp" />
|
<ClCompile Include="Core\PrimeHack\Mods\PortalSkipMP2.cpp" />
|
||||||
<ClCompile Include="Core\PrimeHack\Mods\BloomIntensityMP3.cpp" />
|
<ClCompile Include="Core\PrimeHack\Mods\BloomIntensityMP3.cpp" />
|
||||||
<ClCompile Include="Core\PrimeHack\Mods\SpringballButton.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\Mods\ViewModifier.cpp" />
|
||||||
<ClCompile Include="Core\PrimeHack\PrimeMod.cpp" />
|
<ClCompile Include="Core\PrimeHack\PrimeMod.cpp" />
|
||||||
<ClCompile Include="Core\PrimeHack\PrimeUtils.cpp" />
|
<ClCompile Include="Core\PrimeHack\PrimeUtils.cpp" />
|
||||||
@ -83,6 +84,7 @@
|
|||||||
<ClInclude Include="Core\PrimeHack\Mods\RestoreDashing.h" />
|
<ClInclude Include="Core\PrimeHack\Mods\RestoreDashing.h" />
|
||||||
<ClInclude Include="Core\PrimeHack\Mods\SkipCutscene.h" />
|
<ClInclude Include="Core\PrimeHack\Mods\SkipCutscene.h" />
|
||||||
<ClInclude Include="Core\PrimeHack\Mods\SpringballButton.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\Mods\ViewModifier.h" />
|
||||||
<ClInclude Include="Core\PrimeHack\PrimeMod.h" />
|
<ClInclude Include="Core\PrimeHack\PrimeMod.h" />
|
||||||
<ClInclude Include="Core\PrimeHack\PrimeUtils.h" />
|
<ClInclude Include="Core\PrimeHack\PrimeUtils.h" />
|
||||||
|
@ -119,8 +119,3 @@ void PrimeCheatsWidget::showEvent(QShowEvent*)
|
|||||||
{
|
{
|
||||||
OnLoadConfig();
|
OnLoadConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrimeCheatsWidget::enterEvent(QEvent*)
|
|
||||||
{
|
|
||||||
OnLoadConfig();
|
|
||||||
}
|
|
||||||
|
@ -9,7 +9,6 @@ class PrimeCheatsWidget : public QWidget
|
|||||||
public:
|
public:
|
||||||
explicit PrimeCheatsWidget();
|
explicit PrimeCheatsWidget();
|
||||||
protected:
|
protected:
|
||||||
void enterEvent(QEvent*);
|
|
||||||
void showEvent(QShowEvent*);
|
void showEvent(QShowEvent*);
|
||||||
private:
|
private:
|
||||||
void CreateWidgets();
|
void CreateWidgets();
|
||||||
|
@ -31,15 +31,14 @@
|
|||||||
<AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
|
||||||
<!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
|
<!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
|
||||||
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
|
||||||
<!--Jump through some hoops to generate a pch file local to this project-->
|
<!--Jump through some hoops to generate a pch file local to this project-->
|
||||||
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile>
|
||||||
<ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles>
|
<ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles>
|
||||||
|
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
<AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
|
@ -543,8 +543,8 @@ void RenderWidget::PassEventToImGui(const QEvent* event)
|
|||||||
|
|
||||||
if (Config::Get(Config::PRIMEHACK_ENABLE))
|
if (Config::Get(Config::PRIMEHACK_ENABLE))
|
||||||
{
|
{
|
||||||
int x = static_cast<const QMouseEvent*>(event)->x();
|
int x = static_cast<const QMouseEvent*>(event)->position().x();
|
||||||
int y = static_cast<const QMouseEvent*>(event)->y();
|
int y = static_cast<const QMouseEvent*>(event)->position().y();
|
||||||
|
|
||||||
prime::g_mouse_input->mousePressEvent(x, y);
|
prime::g_mouse_input->mousePressEvent(x, y);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user