Skip to content

Commit b1fa100

Browse files
committed
CMake: Add option to skip installing Noto Color Emoji
1 parent b98f70f commit b1fa100

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

.github/workflows/windows_build_qt.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ jobs:
144144
) else (
145145
msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="${{ inputs.configuration }}" /p:Platform="${{ inputs.platform }}"
146146
)
147+
REM We can use Segoe UI Emoji so we don't need to bundle this
148+
del bin\resources\fonts\NotoColorEmoji*
147149
148150
- name: Run Tests
149151
if: inputs.configuration == 'CMake'

cmake/BuildParameters.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ option(ENABLE_GSRUNNER "Enables building the GSRunner by default. It can still
1212
option(LTO_PCSX2_CORE "Enable LTO/IPO/LTCG on the subset of pcsx2 that benefits most from it but not anything else")
1313
option(USE_VTUNE "Plug VTUNE to profile GS JIT.")
1414
option(PACKAGE_MODE "Use this option to ease packaging of PCSX2 (developer/distribution option)")
15+
option(BUNDLE_EMOJI_FONT "Bundles Noto Color Emoji for systems whose system emoji font isn't usable by freetype" ON)
1516

1617
#-------------------------------------------------------------------------------
1718
# Graphical option

pcsx2/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,9 @@ function(setup_main_executable target)
12631263
if (NOT WIN32 AND "${path}" MATCHES "/dx11/") # Don't include unneccessary stuff
12641264
continue()
12651265
endif()
1266+
if (NOT BUNDLE_EMOJI_FONT AND "${path}" MATCHES "fonts/NotoColorEmoji")
1267+
continue()
1268+
endif()
12661269
pcsx2_resource(${target} ${path} ${CMAKE_SOURCE_DIR}/bin/resources/)
12671270
endforeach()
12681271

0 commit comments

Comments
 (0)