diff options
| author | Timothy Beyer <beyert@cs.ucr.edu> | 2022-06-27 07:09:34 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2022-06-27 07:09:34 +0000 |
| commit | 84f32169ed730eb0244ef01c59aea892ba1d3895 (patch) | |
| tree | 1b1223e5a3aaa9e692a97a7a8ed9dbcd95ec4a43 /emulators/libretro-pcsx2/files | |
| parent | eb935d1066f6c36361138dae21cf0ef016b4e97b (diff) | |
| download | ports-84f32169ed730eb0244ef01c59aea892ba1d3895.tar.gz ports-84f32169ed730eb0244ef01c59aea892ba1d3895.zip | |
emulators/libretro-pcsx2: Fix 32-bit / i386 build
PR: 264219
Diffstat (limited to 'emulators/libretro-pcsx2/files')
| -rw-r--r-- | emulators/libretro-pcsx2/files/patch-3rdparty_wxwidgets3.0_UsewxWidgets.cmake | 9 | ||||
| -rw-r--r-- | emulators/libretro-pcsx2/files/patch-libretro_main.cpp | 30 |
2 files changed, 38 insertions, 1 deletions
diff --git a/emulators/libretro-pcsx2/files/patch-3rdparty_wxwidgets3.0_UsewxWidgets.cmake b/emulators/libretro-pcsx2/files/patch-3rdparty_wxwidgets3.0_UsewxWidgets.cmake index 96b899de88ec..84b8ad354f6d 100644 --- a/emulators/libretro-pcsx2/files/patch-3rdparty_wxwidgets3.0_UsewxWidgets.cmake +++ b/emulators/libretro-pcsx2/files/patch-3rdparty_wxwidgets3.0_UsewxWidgets.cmake @@ -1,6 +1,13 @@ --- 3rdparty/wxwidgets3.0/UsewxWidgets.cmake.orig 2020-10-29 23:31:05 UTC +++ 3rdparty/wxwidgets3.0/UsewxWidgets.cmake -@@ -11,7 +11,7 @@ if(UNIX) +@@ -5,13 +5,13 @@ set(wxWidgets_LIBRARIES wxwidgets) + set(wxWidgets_CXX_FLAGS) + + include_directories(SYSTEM ${wxWidgets_INCLUDE_DIRS}) +-add_definitions(-DwxUSE_GUI=0 -D_FILE_OFFSET_BITS=64) ++add_definitions(-DwxUSE_GUI=0 -D_FILE_OFFSET_BITS=64 -DwxSIZE_T_IS_UINT) + if(UNIX) + add_definitions(-DwxUSE_UNIX -D__UNIX__) if(APPLE) add_definitions(-D__DARWIN__) else() diff --git a/emulators/libretro-pcsx2/files/patch-libretro_main.cpp b/emulators/libretro-pcsx2/files/patch-libretro_main.cpp new file mode 100644 index 000000000000..b6a069f7bec1 --- /dev/null +++ b/emulators/libretro-pcsx2/files/patch-libretro_main.cpp @@ -0,0 +1,30 @@ +--- libretro/main.cpp.orig 2020-10-29 23:31:05 UTC ++++ libretro/main.cpp +@@ -148,6 +148,7 @@ static void RetroLog_DoWriteLn(const wxString& fmt) + RetroLog_DoWrite(fmt + L"\n"); + } + ++/* + static const IConsoleWriter ConsoleWriter_Libretro = + { + RetroLog_DoWrite, +@@ -160,6 +161,7 @@ static const IConsoleWriter ConsoleWriter_Libretro = + + 0, // instance-level indentation (should always be 0) + }; ++*/ + + static std::vector<const char*> disk_images; + static int image_index = 0; +@@ -244,9 +246,11 @@ void retro_init(void) + if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log)) + { + log_cb = log.log; ++/* + #if 0 + Console_SetActiveHandler(ConsoleWriter_Libretro); + #endif ++*/ + } + + // pcsx2 = new Pcsx2App; |