diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a6485ba5..93b40583 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -165,7 +165,9 @@ Code formatting must abide by the [.clang-format](https://github.com/mupen64/mup Failure to comply will fail the check-format workflow. -Naming must abide by the [.clang-tidy](https://github.com/mupen64/mupen64-rr-lua/blob/master/.clang-tidy) file provided in the repository root. +Naming must abide by the [.clang-tidy](https://github.com/mupen64/mupen64-rr-lua/blob/master/.clang-tidy) file provided in the repository root, except for the `Views.Qt6` module, where they should follow Qt conventions. + +CMake targets must remain # Merge/Release Checklist diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f7a8d198..6d9126e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ SPDX-License-Identifier: GPL-2.0-or-later add_subdirectory(Common) function(mupen64rr_reuse_common_pch target) - target_precompile_headers("${target}" REUSE_FROM Mupen64RR.Common) + target_precompile_headers("${target}" REUSE_FROM Mupen64RR_Common) endfunction() # core API and headers add_subdirectory(Core) @@ -49,11 +49,11 @@ if (MUPEN64RR_BUILD_WIN32) add_subdirectory(Common.Win32) - add_library(Mupen64RR.Views.Win32.Headers INTERFACE + add_library(Mupen64RR_Views_Win32_Headers INTERFACE "Views.Win32/include/Views.Win32/ZESpec.h" ) - target_compile_features(Mupen64RR.Views.Win32.Headers INTERFACE cxx_std_26) - target_include_directories(Mupen64RR.Views.Win32.Headers INTERFACE "Views.Win32/include") + target_compile_features(Mupen64RR_Views_Win32_Headers INTERFACE cxx_std_26) + target_include_directories(Mupen64RR_Views_Win32_Headers INTERFACE "Views.Win32/include") # BUNDLED PLUGINS # ============================ diff --git a/src/Common.Views/CMakeLists.txt b/src/Common.Views/CMakeLists.txt index 31581cfd..5042843f 100644 --- a/src/Common.Views/CMakeLists.txt +++ b/src/Common.Views/CMakeLists.txt @@ -4,7 +4,7 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Common.Views STATIC +add_library(Mupen64RR_Common_Views STATIC "include/Common.Views/App.hpp" "include/Common.Views/Config.hpp" "include/Common.Views/Hotkey.hpp" @@ -26,7 +26,7 @@ add_library(Mupen64RR.Common.Views STATIC ) if (WIN32) - target_sources(Mupen64RR.Common.Views PRIVATE + target_sources(Mupen64RR_Common_Views PRIVATE "include/Common.Views/WinFFmpegEncoder.hpp" "include/Common.Views/WinVFWEncoder.hpp" "WinFFmpegEncoder.cpp" @@ -34,13 +34,13 @@ if (WIN32) ) endif() -mupen64rr_reuse_common_pch(Mupen64RR.Common.Views) -target_compile_features(Mupen64RR.Common.Views PUBLIC cxx_std_23) -target_include_directories(Mupen64RR.Common.Views PUBLIC include) +mupen64rr_reuse_common_pch(Mupen64RR_Common_Views) +target_compile_features(Mupen64RR_Common_Views PUBLIC cxx_std_23) +target_include_directories(Mupen64RR_Common_Views PUBLIC include) -target_link_libraries(Mupen64RR.Common.Views PUBLIC - Mupen64RR.Common - Mupen64RR.Core.Headers +target_link_libraries(Mupen64RR_Common_Views PUBLIC + Mupen64RR_Common + Mupen64RR_Core_Headers vendor::xxhash64 vendor::mini vendor::microlru @@ -53,14 +53,14 @@ target_link_libraries(Mupen64RR.Common.Views PUBLIC ) if (WIN32) - target_link_libraries(Mupen64RR.Common.Views PUBLIC vfw32) + target_link_libraries(Mupen64RR_Common_Views PUBLIC vfw32) endif() if (NOT WIN32) - target_link_libraries(Mupen64RR.Common.Views PUBLIC PkgConfig::libsafec) + target_link_libraries(Mupen64RR_Common_Views PUBLIC PkgConfig::libsafec) endif() -target_compile_definitions(Mupen64RR.Common.Views PUBLIC +target_compile_definitions(Mupen64RR_Common_Views PUBLIC NOMINMAX MINI_CASE_SENSITIVE ) diff --git a/src/Common.Win32/CMakeLists.txt b/src/Common.Win32/CMakeLists.txt index 674329cb..0b31cf1e 100644 --- a/src/Common.Win32/CMakeLists.txt +++ b/src/Common.Win32/CMakeLists.txt @@ -3,14 +3,14 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Common.Win32 INTERFACE +add_library(Mupen64RR_Common_Win32 INTERFACE "include/Common.Win32/Common.hpp" "include/Common.Win32/WinFilePicker.hpp" "include/Common.Win32/JoystickControl.hpp" "include/Common.Win32/SettingsListView.hpp" "include/Common.Win32/ResizeAnchor.hpp" ) -target_compile_features(Mupen64RR.Common.Win32 INTERFACE cxx_std_26) -target_include_directories(Mupen64RR.Common.Win32 INTERFACE include) +target_compile_features(Mupen64RR_Common_Win32 INTERFACE cxx_std_26) +target_include_directories(Mupen64RR_Common_Win32 INTERFACE include) -target_compile_definitions(Mupen64RR.Common.Win32 INTERFACE NOMINMAX) +target_compile_definitions(Mupen64RR_Common_Win32 INTERFACE NOMINMAX) diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt index 0dedcf3b..31da5616 100644 --- a/src/Common/CMakeLists.txt +++ b/src/Common/CMakeLists.txt @@ -4,7 +4,7 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Common STATIC +add_library(Mupen64RR_Common STATIC "CommonPCH.cpp" "include/Common/Assert.hpp" "include/Common/CommonPCH.hpp" @@ -15,16 +15,16 @@ add_library(Mupen64RR.Common STATIC "include/Common/VersionNameHelpers.hpp" "include/Common/FNV1A.hpp" ) -target_compile_features(Mupen64RR.Common PUBLIC cxx_std_26) -target_include_directories(Mupen64RR.Common PUBLIC +target_compile_features(Mupen64RR_Common PUBLIC cxx_std_26) +target_include_directories(Mupen64RR_Common PUBLIC include "${CMAKE_CURRENT_SOURCE_DIR}/../../vendor/xxhash64" ) -target_precompile_headers(Mupen64RR.Common PRIVATE +target_precompile_headers(Mupen64RR_Common PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/Common/CommonPCH.hpp" ) -target_link_libraries(Mupen64RR.Common PUBLIC +target_link_libraries(Mupen64RR_Common PUBLIC libdeflate::libdeflate_$,static,shared> PkgConfig::lz4 vendor::xxhash64 @@ -33,7 +33,7 @@ target_link_libraries(Mupen64RR.Common PUBLIC # only MSVCRT implements C11 Annex K, libsafec is needed on other platforms if (NOT WIN32) - target_link_libraries(Mupen64RR.Common PUBLIC PkgConfig::libsafec) + target_link_libraries(Mupen64RR_Common PUBLIC PkgConfig::libsafec) endif() -target_compile_definitions(Mupen64RR.Common PUBLIC NOMINMAX) +target_compile_definitions(Mupen64RR_Common PUBLIC NOMINMAX) diff --git a/src/Core.Tests/CMakeLists.txt b/src/Core.Tests/CMakeLists.txt index 41b74b9e..2d3cc0f1 100644 --- a/src/Core.Tests/CMakeLists.txt +++ b/src/Core.Tests/CMakeLists.txt @@ -9,7 +9,7 @@ if (NOT BUILD_TESTING) return() endif() -add_executable(Mupen64RR.Core.Tests +add_executable(Mupen64RR_Core_Tests "Common.hpp" "PluginAPITests.cpp" @@ -17,23 +17,23 @@ add_executable(Mupen64RR.Core.Tests "VCRTests.cpp" "VRTests.cpp" ) -mupen64rr_copy_vcpkg_deps(Mupen64RR.Core.Tests) -mupen64rr_reuse_common_pch(Mupen64RR.Core.Tests) -target_compile_features(Mupen64RR.Core.Tests PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Core.Tests PROPERTIES +mupen64rr_copy_vcpkg_deps(Mupen64RR_Core_Tests) +mupen64rr_reuse_common_pch(Mupen64RR_Core_Tests) +target_compile_features(Mupen64RR_Core_Tests PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Core_Tests PROPERTIES OUTPUT_NAME "Core.Tests" RUNTIME_OUTPUT_DIRECTORY "${MUPEN64RR_TEST_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${MUPEN64RR_TEST_OUT_DIR}" ) -target_link_libraries(Mupen64RR.Core.Tests PRIVATE +target_link_libraries(Mupen64RR_Core_Tests PRIVATE Catch2::Catch2WithMain - Mupen64RR.Core._TestIncludes + Mupen64RR_Core__TestIncludes ) # Skip running tests when cross-compiling between OSes. if(NOT CMAKE_CROSSCOMPILING) - catch_discover_tests(Mupen64RR.Core.Tests) + catch_discover_tests(Mupen64RR_Core_Tests) else() - message(STATUS "Cross-compiling: skipping test discovery for Mupen64RR.Core.Tests (run manually on target)") + message(STATUS "Cross-compiling: skipping test discovery for Mupen64RR_Core_Tests (run manually on target)") endif() endblock() diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt index 358a97c6..1ea107bc 100644 --- a/src/Core/CMakeLists.txt +++ b/src/Core/CMakeLists.txt @@ -4,16 +4,16 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Core.Headers INTERFACE +add_library(Mupen64RR_Core_Headers INTERFACE "include/m64rr/API.hpp" "include/m64rr/Plugin.hpp" "include/m64rr/Types.hpp" ) -target_compile_features(Mupen64RR.Core.Headers INTERFACE cxx_std_26) -target_include_directories(Mupen64RR.Core.Headers INTERFACE "include") -target_link_libraries(Mupen64RR.Core.Headers INTERFACE Mupen64RR.Common) +target_compile_features(Mupen64RR_Core_Headers INTERFACE cxx_std_26) +target_include_directories(Mupen64RR_Core_Headers INTERFACE "include") +target_link_libraries(Mupen64RR_Core_Headers INTERFACE Mupen64RR_Common) -add_library(Mupen64RR.Core STATIC +add_library(Mupen64RR_Core STATIC "Core.hpp" "Alloc.hpp" "Cheats.hpp" @@ -76,31 +76,31 @@ add_library(Mupen64RR.Core STATIC "R4300/VCR.cpp" ) -mupen64rr_reuse_common_pch(Mupen64RR.Core) -target_compile_features(Mupen64RR.Core PUBLIC cxx_std_26) -set_target_properties(Mupen64RR.Core PROPERTIES +mupen64rr_reuse_common_pch(Mupen64RR_Core) +target_compile_features(Mupen64RR_Core PUBLIC cxx_std_26) +set_target_properties(Mupen64RR_Core PROPERTIES OUTPUT_NAME Core ) -target_include_directories(Mupen64RR.Core PUBLIC "include") -target_include_directories(Mupen64RR.Core PRIVATE ".") -target_link_libraries(Mupen64RR.Core PRIVATE +target_include_directories(Mupen64RR_Core PUBLIC "include") +target_include_directories(Mupen64RR_Core PRIVATE ".") +target_link_libraries(Mupen64RR_Core PRIVATE libdeflate::libdeflate_$,static,shared> PkgConfig::lz4 vendor::aladdin-md5 ) -target_link_libraries(Mupen64RR.Core PUBLIC - Mupen64RR.Common - Mupen64RR.Core.Headers +target_link_libraries(Mupen64RR_Core PUBLIC + Mupen64RR_Common + Mupen64RR_Core_Headers ) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_compile_options(Mupen64RR.Core PRIVATE -Werror=nonportable-include-path) + target_compile_options(Mupen64RR_Core PRIVATE -Werror=nonportable-include-path) endif() # options: disable dynarec if (${MUPEN64RR_ENABLE_DYNAREC}) - target_compile_definitions(Mupen64RR.Core PRIVATE "MUPEN64RR_ENABLE_DYNAREC") + target_compile_definitions(Mupen64RR_Core PRIVATE "MUPEN64RR_ENABLE_DYNAREC") #[=[ Select the dynarec backend by target architecture. x86-64 -> R4300/x86_64 (x86-64 recompiler) @@ -131,7 +131,7 @@ if (${MUPEN64RR_ENABLE_DYNAREC}) endif() message(STATUS "Compiling dynarec: ${dynarec_dir}") - target_sources(Mupen64RR.Core PRIVATE + target_sources(Mupen64RR_Core PRIVATE "${dynarec_dir}/Assemble.hpp" "${dynarec_dir}/Gcop1Helpers.hpp" "${dynarec_dir}/RegCache.hpp" @@ -157,8 +157,8 @@ endif() add_compile_definitions(NOMINMAX) # FOR TESTING ONLY. DO NOT USE OTHERWISE. -add_library(Mupen64RR.Core._TestIncludes INTERFACE) -target_link_libraries(Mupen64RR.Core._TestIncludes INTERFACE - Mupen64RR.Core +add_library(Mupen64RR_Core__TestIncludes INTERFACE) +target_link_libraries(Mupen64RR_Core__TestIncludes INTERFACE + Mupen64RR_Core ) -target_include_directories(Mupen64RR.Core._TestIncludes INTERFACE "../" "./") +target_include_directories(Mupen64RR_Core__TestIncludes INTERFACE "../" "./") diff --git a/src/Lua.TestLib/CMakeLists.txt b/src/Lua.TestLib/CMakeLists.txt index ea07e027..44bd1343 100644 --- a/src/Lua.TestLib/CMakeLists.txt +++ b/src/Lua.TestLib/CMakeLists.txt @@ -4,15 +4,13 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Lua.TestLib MODULE "main.cpp") -mupen64rr_reuse_common_pch(Mupen64RR.Lua.TestLib) -target_compile_features(Mupen64RR.Lua.TestLib PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Lua.TestLib PROPERTIES +add_library(Mupen64RR_Lua_TestLib MODULE "main.cpp") +target_compile_features(Mupen64RR_Lua_TestLib PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Lua_TestLib PROPERTIES OUTPUT_NAME "luatestlib" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_TEST_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${MUPEN64RR_TEST_OUT_DIR}" ) -target_link_libraries(Mupen64RR.Lua.TestLib PRIVATE +target_link_libraries(Mupen64RR_Lua_TestLib PRIVATE Lua::Lua - Mupen64RR.Common ) diff --git a/src/Plugins.Common.cmake b/src/Plugins.Common.cmake index dc90e08e..bd05ff61 100644 --- a/src/Plugins.Common.cmake +++ b/src/Plugins.Common.cmake @@ -7,12 +7,12 @@ SPDX-License-Identifier: GPL-2.0-or-later # # Common Win32 plugin dependencies. -add_library(Mupen64RR.Plugins.Common INTERFACE) -target_link_libraries(Mupen64RR.Plugins.Common INTERFACE - Mupen64RR.Common - Mupen64RR.Core.Headers +add_library(Mupen64RR_Plugins_Common INTERFACE) +target_link_libraries(Mupen64RR_Plugins_Common INTERFACE + Mupen64RR_Common + Mupen64RR_Core_Headers ) -target_compile_definitions(Mupen64RR.Plugins.Common INTERFACE +target_compile_definitions(Mupen64RR_Plugins_Common INTERFACE PLUGIN_WITH_CALLBACKS "VERSION_SUFFIX=\"${MUPEN64RR_VERSION_SUFFIX}\"" "$<$:NIGHTLY>" diff --git a/src/Plugins.DummyAudio/CMakeLists.txt b/src/Plugins.DummyAudio/CMakeLists.txt index c49dc30a..f79f5a06 100644 --- a/src/Plugins.DummyAudio/CMakeLists.txt +++ b/src/Plugins.DummyAudio/CMakeLists.txt @@ -4,18 +4,18 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Plugins.DummyAudio STATIC +add_library(Mupen64RR_Plugins_DummyAudio STATIC "Main.cpp" ) -target_compile_features(Mupen64RR.Plugins.DummyAudio PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Plugins.DummyAudio PROPERTIES +target_compile_features(Mupen64RR_Plugins_DummyAudio PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Plugins_DummyAudio PROPERTIES OUTPUT_NAME "NoAudio" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.DummyAudio) -target_link_libraries(Mupen64RR.Plugins.DummyAudio PRIVATE Mupen64RR.Plugins.Common) -target_compile_definitions(Mupen64RR.Plugins.DummyAudio PRIVATE +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_DummyAudio) +target_link_libraries(Mupen64RR_Plugins_DummyAudio PRIVATE Mupen64RR_Plugins_Common) +target_compile_definitions(Mupen64RR_Plugins_DummyAudio PRIVATE M64RRGetMetadata=M64RRBuiltinNoAudioGetMetadata M64RRProcessEvent=M64RRBuiltinNoAudioProcessEvent ) diff --git a/src/Plugins.DummyInput/CMakeLists.txt b/src/Plugins.DummyInput/CMakeLists.txt index 30bc54a3..75de185f 100644 --- a/src/Plugins.DummyInput/CMakeLists.txt +++ b/src/Plugins.DummyInput/CMakeLists.txt @@ -4,18 +4,18 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Plugins.DummyInput STATIC +add_library(Mupen64RR_Plugins_DummyInput STATIC "Main.cpp" ) -target_compile_features(Mupen64RR.Plugins.DummyInput PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Plugins.DummyInput PROPERTIES +target_compile_features(Mupen64RR_Plugins_DummyInput PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Plugins_DummyInput PROPERTIES OUTPUT_NAME "NoInput" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.DummyInput) -target_link_libraries(Mupen64RR.Plugins.DummyInput PRIVATE Mupen64RR.Plugins.Common) -target_compile_definitions(Mupen64RR.Plugins.DummyInput PRIVATE +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_DummyInput) +target_link_libraries(Mupen64RR_Plugins_DummyInput PRIVATE Mupen64RR_Plugins_Common) +target_compile_definitions(Mupen64RR_Plugins_DummyInput PRIVATE M64RRGetMetadata=M64RRBuiltinNoInputGetMetadata M64RRProcessEvent=M64RRBuiltinNoInputProcessEvent ) diff --git a/src/Plugins.DummyVideo/CMakeLists.txt b/src/Plugins.DummyVideo/CMakeLists.txt index 69a461b1..13752cb3 100644 --- a/src/Plugins.DummyVideo/CMakeLists.txt +++ b/src/Plugins.DummyVideo/CMakeLists.txt @@ -4,18 +4,18 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Plugins.DummyVideo STATIC +add_library(Mupen64RR_Plugins_DummyVideo STATIC "Main.cpp" ) -target_compile_features(Mupen64RR.Plugins.DummyVideo PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Plugins.DummyVideo PROPERTIES +target_compile_features(Mupen64RR_Plugins_DummyVideo PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Plugins_DummyVideo PROPERTIES OUTPUT_NAME "NoVideo" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.DummyVideo) -target_link_libraries(Mupen64RR.Plugins.DummyVideo PRIVATE Mupen64RR.Plugins.Common) -target_compile_definitions(Mupen64RR.Plugins.DummyVideo PRIVATE +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_DummyVideo) +target_link_libraries(Mupen64RR_Plugins_DummyVideo PRIVATE Mupen64RR_Plugins_Common) +target_compile_definitions(Mupen64RR_Plugins_DummyVideo PRIVATE M64RRGetMetadata=M64RRBuiltinNoVideoGetMetadata M64RRProcessEvent=M64RRBuiltinNoVideoProcessEvent ) diff --git a/src/Plugins.TASAudio/CMakeLists.txt b/src/Plugins.TASAudio/CMakeLists.txt index 82d4e7f1..bebedbce 100644 --- a/src/Plugins.TASAudio/CMakeLists.txt +++ b/src/Plugins.TASAudio/CMakeLists.txt @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later -add_library(Mupen64RR.Plugins.TASAudio STATIC +add_library(Mupen64RR_Plugins_TASAudio STATIC "Config.cpp" "Main.cpp" "SDLBackend.cpp" @@ -18,7 +18,7 @@ add_library(Mupen64RR.Plugins.TASAudio STATIC # Conditional changes on Win32 if (MUPEN64RR_BUILD_WIN32) # bundle Win32 sources - target_sources(Mupen64RR.Plugins.TASAudio PRIVATE + target_sources(Mupen64RR_Plugins_TASAudio PRIVATE "Config_Win32.hpp" "Main_Win32.hpp" "Resource.h" @@ -28,19 +28,19 @@ if (MUPEN64RR_BUILD_WIN32) "Resource.rc" ) # link Win32 plugin libraries - target_link_libraries(Mupen64RR.Plugins.TASAudio PRIVATE Mupen64RR.Plugins.Win32.Common) + target_link_libraries(Mupen64RR_Plugins_TASAudio PRIVATE Mupen64RR_Plugins_Win32_Common) else() # link cross-platform plugin libraries - target_link_libraries(Mupen64RR.Plugins.TASAudio PRIVATE Mupen64RR.Plugins.Common) + target_link_libraries(Mupen64RR_Plugins_TASAudio PRIVATE Mupen64RR_Plugins_Common) endif() -target_link_libraries(Mupen64RR.Plugins.TASAudio PRIVATE +target_link_libraries(Mupen64RR_Plugins_TASAudio PRIVATE SDL3::SDL3 nlohmann_json::nlohmann_json ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.TASAudio) -target_compile_features(Mupen64RR.Plugins.TASAudio PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Plugins.TASAudio PROPERTIES +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_TASAudio) +target_compile_features(Mupen64RR_Plugins_TASAudio PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Plugins_TASAudio PROPERTIES OUTPUT_NAME "TASAudio" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" @@ -48,7 +48,7 @@ set_target_properties(Mupen64RR.Plugins.TASAudio PROPERTIES add_compile_definitions(NOMINMAX) -target_compile_definitions(Mupen64RR.Plugins.TASAudio PRIVATE +target_compile_definitions(Mupen64RR_Plugins_TASAudio PRIVATE M64RRGetMetadata=M64RRBuiltinTASAudioGetMetadata M64RRProcessEvent=M64RRBuiltinTASAudioProcessEvent M64RRAIDacrateChanged=M64RRBuiltinTASAudioAIDacrateChanged diff --git a/src/Plugins.TASRSP/CMakeLists.txt b/src/Plugins.TASRSP/CMakeLists.txt index ac4f60fc..1beddc8d 100644 --- a/src/Plugins.TASRSP/CMakeLists.txt +++ b/src/Plugins.TASRSP/CMakeLists.txt @@ -4,7 +4,7 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Plugins.TASRSP STATIC +add_library(Mupen64RR_Plugins_TASRSP STATIC "Config.hpp" "HLE.hpp" "Main.hpp" @@ -18,20 +18,20 @@ add_library(Mupen64RR.Plugins.TASRSP STATIC "UCode3.cpp" ) -target_compile_features(Mupen64RR.Plugins.TASRSP PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Plugins.TASRSP PROPERTIES +target_compile_features(Mupen64RR_Plugins_TASRSP PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Plugins_TASRSP PROPERTIES OUTPUT_NAME "TASRSP" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.TASRSP) -target_include_directories(Mupen64RR.Plugins.TASRSP PRIVATE ".") -target_link_libraries(Mupen64RR.Plugins.TASRSP PRIVATE - Mupen64RR.Plugins.Common +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_TASRSP) +target_include_directories(Mupen64RR_Plugins_TASRSP PRIVATE ".") +target_link_libraries(Mupen64RR_Plugins_TASRSP PRIVATE + Mupen64RR_Plugins_Common nlohmann_json::nlohmann_json ) -target_compile_definitions(Mupen64RR.Plugins.TASRSP PRIVATE +target_compile_definitions(Mupen64RR_Plugins_TASRSP PRIVATE M64RRGetMetadata=M64RRBuiltinTASRSPGetMetadata M64RRProcessEvent=M64RRBuiltinTASRSPProcessEvent M64RRDoRSPCycles=M64RRBuiltinTASRSPDoRSPCycles diff --git a/src/Plugins.TASVideo/CMakeLists.txt b/src/Plugins.TASVideo/CMakeLists.txt index 940a162a..6ad593dc 100644 --- a/src/Plugins.TASVideo/CMakeLists.txt +++ b/src/Plugins.TASVideo/CMakeLists.txt @@ -4,7 +4,7 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Plugins.TASVideo STATIC +add_library(Mupen64RR_Plugins_TASVideo STATIC "VI.hpp" "Types.hpp" "Common.hpp" @@ -66,10 +66,10 @@ add_library(Mupen64RR.Plugins.TASVideo STATIC "2xSAI.cpp" ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.TASVideo) +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_TASVideo) if (MUPEN64RR_BUILD_WIN32) - target_sources(Mupen64RR.Plugins.TASVideo PRIVATE + target_sources(Mupen64RR_Plugins_TASVideo PRIVATE "MicrocodeDialog_Win32.hpp" "ConfigDialog_Win32.hpp" "Resource.h" @@ -79,25 +79,25 @@ if (MUPEN64RR_BUILD_WIN32) "TASVideo_Win32.cpp" "Resource.rc" ) - target_link_libraries(Mupen64RR.Plugins.TASVideo PRIVATE Mupen64RR.Plugins.Win32.Common) + target_link_libraries(Mupen64RR_Plugins_TASVideo PRIVATE Mupen64RR_Plugins_Win32_Common) else() - target_link_libraries(Mupen64RR.Plugins.TASVideo PRIVATE Mupen64RR.Plugins.Common) + target_link_libraries(Mupen64RR_Plugins_TASVideo PRIVATE Mupen64RR_Plugins_Common) endif() -target_compile_features(Mupen64RR.Plugins.TASVideo PRIVATE cxx_std_26) -target_compile_definitions(Mupen64RR.Plugins.TASVideo PRIVATE +target_compile_features(Mupen64RR_Plugins_TASVideo PRIVATE cxx_std_26) +target_compile_definitions(Mupen64RR_Plugins_TASVideo PRIVATE MUPEN64RR_BUILD_WIN32=$ MUPEN64RR_BUILD_QT6=$ ) -set_target_properties(Mupen64RR.Plugins.TASVideo PROPERTIES +set_target_properties(Mupen64RR_Plugins_TASVideo PROPERTIES OUTPUT_NAME "TASVideo" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -target_include_directories(Mupen64RR.Plugins.TASVideo PRIVATE ".") +target_include_directories(Mupen64RR_Plugins_TASVideo PRIVATE ".") if (MUPEN64RR_BUILD_WIN32) - target_link_libraries(Mupen64RR.Plugins.TASVideo PRIVATE + target_link_libraries(Mupen64RR_Plugins_TASVideo PRIVATE comctl32 uxtheme msimg32 @@ -105,7 +105,7 @@ if (MUPEN64RR_BUILD_WIN32) ) endif() -target_link_libraries(Mupen64RR.Plugins.TASVideo PRIVATE +target_link_libraries(Mupen64RR_Plugins_TASVideo PRIVATE vendor::glad vendor::hqx vendor::xbrz @@ -113,7 +113,7 @@ target_link_libraries(Mupen64RR.Plugins.TASVideo PRIVATE SDL3::SDL3 ) -target_compile_definitions(Mupen64RR.Plugins.TASVideo PRIVATE +target_compile_definitions(Mupen64RR_Plugins_TASVideo PRIVATE M64RRGetMetadata=M64RRBuiltinTASVideoGetMetadata M64RRProcessEvent=M64RRBuiltinTASVideoProcessEvent M64RRProcessDList=M64RRBuiltinTASVideoProcessDList diff --git a/src/Plugins.Win32.Common.cmake b/src/Plugins.Win32.Common.cmake index b4e4e82d..65c7a865 100644 --- a/src/Plugins.Win32.Common.cmake +++ b/src/Plugins.Win32.Common.cmake @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later # # Common Win32 plugin dependencies. -add_library(Mupen64RR.Plugins.Win32.Common INTERFACE) -target_link_libraries(Mupen64RR.Plugins.Win32.Common INTERFACE - Mupen64RR.Plugins.Common - Mupen64RR.Common.Win32 - Mupen64RR.Views.Win32.Headers +add_library(Mupen64RR_Plugins_Win32_Common INTERFACE) +target_link_libraries(Mupen64RR_Plugins_Win32_Common INTERFACE + Mupen64RR_Plugins_Common + Mupen64RR_Common_Win32 + Mupen64RR_Views_Win32_Headers ) diff --git a/src/Plugins.Win32.TASInput/CMakeLists.txt b/src/Plugins.Win32.TASInput/CMakeLists.txt index e33aa8af..5dbab3b7 100644 --- a/src/Plugins.Win32.TASInput/CMakeLists.txt +++ b/src/Plugins.Win32.TASInput/CMakeLists.txt @@ -4,7 +4,7 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -add_library(Mupen64RR.Plugins.Win32.TASInput STATIC +add_library(Mupen64RR_Plugins_Win32_TASInput STATIC "TASInput.hpp" "Common.hpp" "Resource.h" @@ -24,22 +24,22 @@ add_library(Mupen64RR.Plugins.Win32.TASInput STATIC "Resource.rc" ) -mupen64rr_reuse_common_pch(Mupen64RR.Plugins.Win32.TASInput) -target_compile_features(Mupen64RR.Plugins.Win32.TASInput PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Plugins.Win32.TASInput PROPERTIES +mupen64rr_reuse_common_pch(Mupen64RR_Plugins_Win32_TASInput) +target_compile_features(Mupen64RR_Plugins_Win32_TASInput PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Plugins_Win32_TASInput PROPERTIES CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON OUTPUT_NAME "TASInput" LIBRARY_OUTPUT_DIRECTORY "${MUPEN64RR_PLUGIN_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -target_include_directories(Mupen64RR.Plugins.Win32.TASInput PRIVATE ".") -target_link_libraries(Mupen64RR.Plugins.Win32.TASInput PRIVATE - Mupen64RR.Plugins.Win32.Common +target_include_directories(Mupen64RR_Plugins_Win32_TASInput PRIVATE ".") +target_link_libraries(Mupen64RR_Plugins_Win32_TASInput PRIVATE + Mupen64RR_Plugins_Win32_Common SDL3::SDL3 nlohmann_json::nlohmann_json ) -target_link_libraries(Mupen64RR.Plugins.Win32.TASInput PRIVATE +target_link_libraries(Mupen64RR_Plugins_Win32_TASInput PRIVATE setupapi hid imm32 @@ -50,7 +50,7 @@ target_link_libraries(Mupen64RR.Plugins.Win32.TASInput PRIVATE gdiplus ) -target_compile_definitions(Mupen64RR.Plugins.Win32.TASInput PRIVATE +target_compile_definitions(Mupen64RR_Plugins_Win32_TASInput PRIVATE M64RRGetMetadata=M64RRBuiltinTASInputGetMetadata M64RRProcessEvent=M64RRBuiltinTASInputProcessEvent M64RRReadController=M64RRBuiltinTASInputReadController diff --git a/src/Views.Qt6/CMakeLists.txt b/src/Views.Qt6/CMakeLists.txt index 8d0a33e6..b81ad198 100644 --- a/src/Views.Qt6/CMakeLists.txt +++ b/src/Views.Qt6/CMakeLists.txt @@ -7,31 +7,31 @@ SPDX-License-Identifier: GPL-2.0-or-later add_subdirectory(Utils) add_subdirectory(Core) -qt_add_executable(Mupen64RR.Views.Qt6 "Main.cpp") -mupen64rr_reuse_common_pch(Mupen64RR.Views.Qt6) -target_compile_features(Mupen64RR.Views.Qt6 PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Views.Qt6 PROPERTIES +qt_add_executable(Mupen64RR_Views_Qt6 "Main.cpp") +mupen64rr_reuse_common_pch(Mupen64RR_Views_Qt6) +target_compile_features(Mupen64RR_Views_Qt6 PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Views_Qt6 PROPERTIES # output location OUTPUT_NAME "mupen64-qt6" RUNTIME_OUTPUT_DIRECTORY "${MUPEN64RR_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${MUPEN64RR_OUT_DIR}" ) -target_include_directories(Mupen64RR.Views.Qt6 PRIVATE ".") -target_link_libraries(Mupen64RR.Views.Qt6 PRIVATE - Mupen64RR.Common - Mupen64RR.Common.Views - Mupen64RR.Core +target_include_directories(Mupen64RR_Views_Qt6 PRIVATE ".") +target_link_libraries(Mupen64RR_Views_Qt6 PRIVATE + Mupen64RR_Common + Mupen64RR_Common_Views + Mupen64RR_Core - Mupen64RR.Views.Qt6.Utils - Mupen64RR.Views.Qt6.Utilsplugin - Mupen64RR.Views.Qt6.Core - Mupen64RR.Views.Qt6.Coreplugin + Mupen64RR_Views_Qt6_Utils + Mupen64RR_Views_Qt6_Utilsplugin + Mupen64RR_Views_Qt6_Core + Mupen64RR_Views_Qt6_Coreplugin Qt::Quick Qt::QuickControls2 ) -qt_add_qml_module(Mupen64RR.Views.Qt6 URI "Views" QML_FILES +qt_add_qml_module(Mupen64RR_Views_Qt6 URI "Views" QML_FILES "Views/DialogService.qml" "Views/MainMenuBar.qml" "Views/MainWindow.qml" @@ -40,11 +40,11 @@ qt_add_qml_module(Mupen64RR.Views.Qt6 URI "Views" QML_FILES # MinGW needs this for std::print(ln) some reason... if(MINGW) - target_link_libraries(Mupen64RR.Views.Qt6 PRIVATE stdc++exp) + target_link_libraries(Mupen64RR_Views_Qt6 PRIVATE stdc++exp) endif() windeployqt6( - TARGET Mupen64RR.Views.Qt6 + TARGET Mupen64RR_Views_Qt6 DEPLOY_TO_BUILD_DIR ARGS --qmldir . ) diff --git a/src/Views.Qt6/Core/CMakeLists.txt b/src/Views.Qt6/Core/CMakeLists.txt index 6d569dc8..b8f9df90 100644 --- a/src/Views.Qt6/Core/CMakeLists.txt +++ b/src/Views.Qt6/Core/CMakeLists.txt @@ -4,11 +4,11 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -qt_add_library(Mupen64RR.Views.Qt6.Core STATIC) -mupen64rr_reuse_common_pch(Mupen64RR.Views.Qt6.Core) -qt_add_qml_module(Mupen64RR.Views.Qt6.Core URI "Core" +qt_add_library(Mupen64RR_Views_Qt6_Core STATIC) +mupen64rr_reuse_common_pch(Mupen64RR_Views_Qt6_Core) +qt_add_qml_module(Mupen64RR_Views_Qt6_Core URI "Core" IMPORTS - TARGET Mupen64RR.Views.Qt6.Utils + TARGET Mupen64RR_Views_Qt6_Utils SOURCES "plugin/BuiltinTAS.hpp" "plugin/Plugin.hpp" @@ -22,14 +22,14 @@ qt_add_qml_module(Mupen64RR.Views.Qt6.Core URI "Core" "EmuContext.cpp" "EmuDisplay.cpp" ) -target_compile_features(Mupen64RR.Views.Qt6.Core PUBLIC cxx_std_26) -target_include_directories(Mupen64RR.Views.Qt6.Core PUBLIC ".") -target_link_libraries(Mupen64RR.Views.Qt6.Core PUBLIC - Mupen64RR.Common - Mupen64RR.Common.Views - Mupen64RR.Core +target_compile_features(Mupen64RR_Views_Qt6_Core PUBLIC cxx_std_26) +target_include_directories(Mupen64RR_Views_Qt6_Core PUBLIC ".") +target_link_libraries(Mupen64RR_Views_Qt6_Core PUBLIC + Mupen64RR_Common + Mupen64RR_Common_Views + Mupen64RR_Core - Mupen64RR.Views.Qt6.Utils + Mupen64RR_Views_Qt6_Utils Qt6::Core Qt6::Quick @@ -37,12 +37,12 @@ target_link_libraries(Mupen64RR.Views.Qt6.Core PUBLIC vendor::decan ) -target_link_libraries(Mupen64RR.Views.Qt6.Core PUBLIC - Mupen64RR.Plugins.DummyVideo - Mupen64RR.Plugins.DummyAudio - Mupen64RR.Plugins.DummyInput +target_link_libraries(Mupen64RR_Views_Qt6_Core PUBLIC + Mupen64RR_Plugins_DummyVideo + Mupen64RR_Plugins_DummyAudio + Mupen64RR_Plugins_DummyInput - Mupen64RR.Plugins.TASVideo - Mupen64RR.Plugins.TASAudio - Mupen64RR.Plugins.TASRSP + Mupen64RR_Plugins_TASVideo + Mupen64RR_Plugins_TASAudio + Mupen64RR_Plugins_TASRSP ) diff --git a/src/Views.Qt6/Utils/CMakeLists.txt b/src/Views.Qt6/Utils/CMakeLists.txt index a0c13341..3c358c93 100644 --- a/src/Views.Qt6/Utils/CMakeLists.txt +++ b/src/Views.Qt6/Utils/CMakeLists.txt @@ -4,21 +4,21 @@ Copyright (c) 2026, Mupen64 Organization (https://github.com/mupen64) SPDX-License-Identifier: GPL-2.0-or-later ]===] -qt_add_library(Mupen64RR.Views.Qt6.Utils STATIC) -mupen64rr_reuse_common_pch(Mupen64RR.Views.Qt6.Utils) -qt_add_qml_module(Mupen64RR.Views.Qt6.Utils URI "Utils" SOURCES +qt_add_library(Mupen64RR_Views_Qt6_Utils STATIC) +mupen64rr_reuse_common_pch(Mupen64RR_Views_Qt6_Utils) +qt_add_qml_module(Mupen64RR_Views_Qt6_Utils URI "Utils" SOURCES "include/QJSFunctions.hpp" "include/QtIconImageProvider.hpp" "include/QtUtils.hpp" "include/QmlCallableContext.hpp" "QtIconImageProvider.cpp" ) -target_compile_features(Mupen64RR.Views.Qt6.Utils PUBLIC cxx_std_26) -target_include_directories(Mupen64RR.Views.Qt6.Utils PUBLIC "include") -target_link_libraries(Mupen64RR.Views.Qt6.Utils PUBLIC - Mupen64RR.Common - Mupen64RR.Common.Views - Mupen64RR.Core +target_compile_features(Mupen64RR_Views_Qt6_Utils PUBLIC cxx_std_26) +target_include_directories(Mupen64RR_Views_Qt6_Utils PUBLIC "include") +target_link_libraries(Mupen64RR_Views_Qt6_Utils PUBLIC + Mupen64RR_Common + Mupen64RR_Common_Views + Mupen64RR_Core Qt6::Core Qt6::Quick diff --git a/src/Views.Win32/CMakeLists.txt b/src/Views.Win32/CMakeLists.txt index e5359bb3..2af4f2cf 100644 --- a/src/Views.Win32/CMakeLists.txt +++ b/src/Views.Win32/CMakeLists.txt @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later -add_executable(Mupen64RR.Views.Win32 WIN32 +add_executable(Mupen64RR_Views_Win32 WIN32 # headers "Common.hpp" "ThreadPool.hpp" @@ -118,18 +118,18 @@ add_executable(Mupen64RR.Views.Win32 WIN32 # Resource script "Resource.rc" ) -mupen64rr_reuse_common_pch(Mupen64RR.Views.Win32) -target_compile_features(Mupen64RR.Views.Win32 PRIVATE cxx_std_26) -set_target_properties(Mupen64RR.Views.Win32 PROPERTIES +mupen64rr_reuse_common_pch(Mupen64RR_Views_Win32) +target_compile_features(Mupen64RR_Views_Win32 PRIVATE cxx_std_26) +set_target_properties(Mupen64RR_Views_Win32 PROPERTIES # output location OUTPUT_NAME "mupen64" RUNTIME_OUTPUT_DIRECTORY "${MUPEN64RR_OUT_DIR}" PDB_OUTPUT_DIRECTORY "${MUPEN64RR_OUT_DIR}" ) -mupen64rr_copy_vcpkg_deps(Mupen64RR.Views.Win32) -mupen64rr_copy_mingw_runtime(Mupen64RR.Views.Win32) -mupen64rr_copy_msvc_runtime(Mupen64RR.Views.Win32) -add_custom_command(TARGET Mupen64RR.Views.Win32 POST_BUILD +mupen64rr_copy_vcpkg_deps(Mupen64RR_Views_Win32) +mupen64rr_copy_mingw_runtime(Mupen64RR_Views_Win32) +mupen64rr_copy_msvc_runtime(Mupen64RR_Views_Win32) +add_custom_command(TARGET Mupen64RR_Views_Win32 POST_BUILD COMMAND "${CMAKE_COMMAND}" -D "MUPEN64RR_OUT_DIR=${MUPEN64RR_OUT_DIR}" -P "${CMAKE_CURRENT_SOURCE_DIR}/RenameSpeexDsp.cmake" @@ -145,13 +145,13 @@ set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/Lua/sandbox.lua" "${CMAKE_CURRENT_SOURCE_DIR}/../../vendor/lua-modules/inspect.lua" ) -target_include_directories(Mupen64RR.Views.Win32 PRIVATE ".") -target_link_libraries(Mupen64RR.Views.Win32 PRIVATE - Mupen64RR.Common - Mupen64RR.Common.Views - Mupen64RR.Common.Win32 - Mupen64RR.Core - Mupen64RR.Views.Win32.Headers +target_include_directories(Mupen64RR_Views_Win32 PRIVATE ".") +target_link_libraries(Mupen64RR_Views_Win32 PRIVATE + Mupen64RR_Common + Mupen64RR_Common_Views + Mupen64RR_Common_Win32 + Mupen64RR_Core + Mupen64RR_Views_Win32_Headers Lua::Lua spdlog::spdlog SDL3::SDL3 @@ -163,16 +163,16 @@ target_link_libraries(Mupen64RR.Views.Win32 PRIVATE vendor::windarkmode vendor::microlru vendor::mini - Mupen64RR.Plugins.DummyAudio - Mupen64RR.Plugins.DummyInput - Mupen64RR.Plugins.DummyVideo - Mupen64RR.Plugins.TASAudio - Mupen64RR.Plugins.TASRSP - Mupen64RR.Plugins.TASVideo - Mupen64RR.Plugins.Win32.TASInput + Mupen64RR_Plugins_DummyAudio + Mupen64RR_Plugins_DummyInput + Mupen64RR_Plugins_DummyVideo + Mupen64RR_Plugins_TASAudio + Mupen64RR_Plugins_TASRSP + Mupen64RR_Plugins_TASVideo + Mupen64RR_Plugins_Win32_TASInput ) # Windows library linkages -target_link_libraries(Mupen64RR.Views.Win32 PRIVATE +target_link_libraries(Mupen64RR_Views_Win32 PRIVATE shlwapi vfw32 winmm @@ -193,12 +193,12 @@ target_link_libraries(Mupen64RR.Views.Win32 PRIVATE winhttp ) -target_compile_definitions(Mupen64RR.Views.Win32 PRIVATE +target_compile_definitions(Mupen64RR_Views_Win32 PRIVATE "MINI_CASE_SENSITIVE" "VERSION_SUFFIX=\"${MUPEN64RR_VERSION_SUFFIX}\"" "$<$:NIGHTLY>" ) if(MSVC) - target_link_options(Mupen64RR.Views.Win32 PRIVATE "/MANIFEST:NO") + target_link_options(Mupen64RR_Views_Win32 PRIVATE "/MANIFEST:NO") endif()