diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2022-12-23 22:05:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 22:05:29 +0100 |
| commit | 2345ba178d91b172319472add4232d2c97bb180c (patch) | |
| tree | 58aa794014c97b63ec3f2c56b4fe2b1e75219f90 /Source | |
| parent | ce92350140ed4bf918147695a894f609e95452e9 (diff) | |
| parent | 1c85143aba0b76524dc67dfb8218a32541e07ee5 (diff) | |
Merge pull request #11356 from Sam-Belliveau/update-dear-implot
Externals: Add Dear Implot
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinLib.vcxproj | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Source/dolphin-emu.sln | 10 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Source/Core/DolphinLib.vcxproj b/Source/Core/DolphinLib.vcxproj index 1aad7a65c3..5875de1550 100644 --- a/Source/Core/DolphinLib.vcxproj +++ b/Source/Core/DolphinLib.vcxproj @@ -41,6 +41,7 @@ <Import Project="$(ExternalsDir)FreeSurround\exports.props" /> <Import Project="$(ExternalsDir)glslang\exports.props" /> <Import Project="$(ExternalsDir)imgui\exports.props" /> + <Import Project="$(ExternalsDir)implot\exports.props" /> <Import Project="$(ExternalsDir)liblzma\exports.props" /> <Import Project="$(ExternalsDir)libspng\exports.props" /> <Import Project="$(ExternalsDir)libusb\exports.props" /> diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index d5025114af..79bd9c7509 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -612,12 +612,12 @@ if(APPLE) add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Dolphin.app" || true) - + # Code sign builds for build systems that do have release/debug variants (Xcode) add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmuDebug.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Dolphin.app" || true) - + add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Dolphin.app" || true) @@ -678,4 +678,4 @@ endif() if(USE_DISCORD_PRESENCE) target_compile_definitions(dolphin-emu PRIVATE -DUSE_DISCORD_PRESENCE) -endif() +endif()
\ No newline at end of file diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index b4a36b08c3..5a9a0942d0 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -67,6 +67,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "..\Externals\min EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui", "..\Externals\imgui\imgui.vcxproj", "{4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "implot", "..\Externals\implot\implot.vcxproj", "{A608225E-AE0A-4D1A-9B55-97F57C862391}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\Externals\bzip2\bzip2.vcxproj", "{1D8C51D2-FFA4-418E-B183-9F42B6A6717E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "..\Externals\liblzma\liblzma.vcxproj", "{055A775F-B4F5-4970-9240-F6CF7661F37B}" @@ -337,6 +339,14 @@ Global {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|ARM64.Build.0 = Release|ARM64 {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|x64.ActiveCfg = Release|x64 {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|x64.Build.0 = Release|x64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Debug|ARM64.Build.0 = Debug|ARM64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Debug|x64.ActiveCfg = Debug|x64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Debug|x64.Build.0 = Debug|x64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Release|ARM64.ActiveCfg = Release|ARM64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Release|ARM64.Build.0 = Release|ARM64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Release|x64.ActiveCfg = Release|x64 + {A608225E-AE0A-4D1A-9B55-97F57C862391}.Release|x64.Build.0 = Release|x64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|ARM64.Build.0 = Debug|ARM64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|x64.ActiveCfg = Debug|x64 |