diff --git a/src/assets/Default_VPinballX.ini b/src/assets/Default_VPinballX.ini index bb454fc4d..0b0bee210 100644 --- a/src/assets/Default_VPinballX.ini +++ b/src/assets/Default_VPinballX.ini @@ -25,6 +25,7 @@ PinMAMEWindowHeight = PinMAMEWindowRotation = AltSound = AltColor = +PUPCapture = FlexDMDWindow = FlexDMDWindowX = FlexDMDWindowY = diff --git a/standalone/README.md b/standalone/README.md index ca4ee94e9..580eaf99d 100644 --- a/standalone/README.md +++ b/standalone/README.md @@ -238,6 +238,20 @@ cmake -DCMAKE_BUILD_TYPE=Release -B build cmake --build build -- -j$(nproc) ``` +### Linux (Ubuntu 23.10) + +In a terminal execute the following: +``` +sudo apt install git build-essential autoconf automake libtool cmake nasm bison curl zlib1g-dev libdrm-dev libgbm-dev libglu1-mesa-dev libegl-dev libudev-dev libx11-dev libxrandr-dev nasm +git clone -b standalone https://github.com/vpinball/vpinball +cd vpinball/standalone/linux-x64 +CC=gcc-13 CXX=g++-13 ./external.sh +cd ../.. +cp standalone/cmake/CMakeLists_gl-linux-x64.txt CMakeLists.txt +cmake -DCMAKE_BUILD_TYPE=Release -B build +cmake --build build -- -j$(nproc) +``` + ### Linux (Fedora 37) In a terminal execute the following: diff --git a/standalone/Standalone.cpp b/standalone/Standalone.cpp index 67914e7a8..3690d5ae2 100644 --- a/standalone/Standalone.cpp +++ b/standalone/Standalone.cpp @@ -50,6 +50,7 @@ void Standalone::Startup() pConfig->SetDMDServer(pSettings->LoadValueWithDefault(Settings::Standalone, "DMDServer"s, false)); pConfig->SetDMDServerAddr(pSettings->LoadValueWithDefault(Settings::Standalone, "DMDServerAddr"s, "localhost"s).c_str()); pConfig->SetDMDServerPort(pSettings->LoadValueWithDefault(Settings::Standalone, "DMDServerPort"s, 6789)); + pConfig->SetPUPCapture(pSettings->LoadValueWithDefault(Settings::Standalone, "PUPCapture"s, false)); if (pSettings->LoadValueWithDefault(Settings::Standalone, "B2SPlugins"s, false)) { if (pSettings->LoadValueWithDefault(Settings::Standalone, "DOFPlugin"s, true)) diff --git a/standalone/android-arm64-v8a/external.sh b/standalone/android-arm64-v8a/external.sh index d332253f4..38c1edecb 100755 --- a/standalone/android-arm64-v8a/external.sh +++ b/standalone/android-arm64-v8a/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0 diff --git a/standalone/inc/vpinmame/VPinMAMEController.cpp b/standalone/inc/vpinmame/VPinMAMEController.cpp index 403f7a776..810475864 100644 --- a/standalone/inc/vpinmame/VPinMAMEController.cpp +++ b/standalone/inc/vpinmame/VPinMAMEController.cpp @@ -57,6 +57,12 @@ void PINMAMECALLBACK VPinMAMEController::OnDisplayAvailable(int index, int displ pDisplay->pDMD->SetRomName(pController->m_pPinmameGame->name); } + if (g_pplayer->m_ptable->m_settings.LoadValueWithDefault(Settings::Standalone, "PUPCapture"s, false)) { + string szPupVideosPath = g_pvp->m_currentTablePath + "PupVideos" + PATH_SEPARATOR_CHAR; + pDisplay->pDMD->SetPUPVideosPath(szPupVideosPath.c_str()); + pDisplay->pDMD->SetRomName(pController->m_pPinmameGame->name); + } + if (!pController->m_pActiveDisplay) { pController->m_pActiveDisplay = pDisplay; if (pController->m_pDMDWindow) diff --git a/standalone/ios-arm64/external.sh b/standalone/ios-arm64/external.sh index f84bb0896..5bbc05b7c 100755 --- a/standalone/ios-arm64/external.sh +++ b/standalone/ios-arm64/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0 diff --git a/standalone/linux-aarch64/external.sh b/standalone/linux-aarch64/external.sh index 0499925da..bb8da3278 100755 --- a/standalone/linux-aarch64/external.sh +++ b/standalone/linux-aarch64/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0 diff --git a/standalone/linux-x64/external.sh b/standalone/linux-x64/external.sh index 77d7b40cf..def7a0748 100755 --- a/standalone/linux-x64/external.sh +++ b/standalone/linux-x64/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0 diff --git a/standalone/macos-arm64/external.sh b/standalone/macos-arm64/external.sh index 6baaa4916..23037ec95 100755 --- a/standalone/macos-arm64/external.sh +++ b/standalone/macos-arm64/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0 diff --git a/standalone/macos-x64/external.sh b/standalone/macos-x64/external.sh index 35c8c7559..12f1deef5 100755 --- a/standalone/macos-x64/external.sh +++ b/standalone/macos-x64/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0 diff --git a/standalone/tvos-arm64/external.sh b/standalone/tvos-arm64/external.sh index a0b05441f..9f018e571 100755 --- a/standalone/tvos-arm64/external.sh +++ b/standalone/tvos-arm64/external.sh @@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION=2.8.2 SDL2_TTF_VERSION=2.22.0 PINMAME_SHA=788aa7af6eae8f777882e42abf44117f95a26bf4 LIBALTSOUND_SHA=9ac08a76e2aabc1fba57d3e5a3b87e7f63c09e07 -LIBDMDUTIL_SHA=4e5abe7934bfed1ce7b822b28ffbaf9104359083 +LIBDMDUTIL_SHA=93411244c5999fc293d9df1eeb02e0b45b129bc2 LIBDOF_SHA=92890aac83c03d76ed261424c274e17a9d54f6eb BGFX_CMAKE_VERSION=1.126.8700-463 FFMPEG_SHA=e38092ef9395d7049f871ef4d5411eb410e283e0