@ -401,7 +401,6 @@ target_link_libraries(yuzu PRIVATE nlohmann_json::nlohmann_json)
target_link_libraries ( yuzu PRIVATE Boost::headers glad Qt6::Widgets )
target_link_libraries ( yuzu PRIVATE ${ PLATFORM_LIBRARIES } Threads::Threads )
target_link_libraries ( yuzu PRIVATE Vulkan::Headers )
if ( NOT WIN32 )
target_include_directories ( yuzu PRIVATE ${ Qt6Gui_PRIVATE_INCLUDE_DIRS } )
endif ( )
@ -416,24 +415,24 @@ endif()
target_compile_definitions ( yuzu PRIVATE
# U s e Q S t r i n g B u i l d e r f o r s t r i n g c o n c a t e n a t i o n t o r e d u c e
# t h e o v e r a l l n u m b e r o f t e m p o r a r y s t r i n g s c r e a t e d .
- D Q T _ U S E _ Q S T R I N G B U I L D E R
Q T _ U S E _ Q S T R I N G B U I L D E R
# D i s a b l e i m p l i c i t c o n v e r s i o n s f r o m / t o C s t r i n g s
- D Q T _ N O _ C A S T _ F R O M _ A S C I I
- D Q T _ N O _ C A S T _ T O _ A S C I I
Q T _ N O _ C A S T _ F R O M _ A S C I I
Q T _ N O _ C A S T _ T O _ A S C I I
# D i s a b l e i m p l i c i t t y p e n a r r o w i n g i n s i g n a l / s l o t connect ( ) c a l l s .
- D Q T _ N O _ N A R R O W I N G _ C O N V E R S I O N S _ I N _ C O N N E C T
Q T _ N O _ N A R R O W I N G _ C O N V E R S I O N S _ I N _ C O N N E C T
# D i s a b l e u n s a f e o v e r l o a d s o f Q P r o c e s s ' start ( ) f u n c t i o n .
- D Q T _ N O _ P R O C E S S _ C O M B I N E D _ A R G U M E N T _ S T A R T
Q T _ N O _ P R O C E S S _ C O M B I N E D _ A R G U M E N T _ S T A R T
# D i s a b l e i m p l i c i t Q S t r i n g - > Q U r l c o n v e r s i o n s t o e n f o r c e u s e o f p r o p e r r e s o l v i n g f u n c t i o n s .
- D Q T _ N O _ U R L _ C A S T _ F R O M _ S T R I N G
Q T _ N O _ U R L _ C A S T _ F R O M _ S T R I N G
)
if ( YUZU_ENABLE_COMPATIBILITY_REPORTING )
target_compile_definitions ( yuzu PRIVATE -D YUZU_ENABLE_COMPATIBILITY_REPORTING)
target_compile_definitions ( yuzu PRIVATE YUZU_ENABLE_COMPATIBILITY_REPORTING )
endif ( )
if ( USE_DISCORD_PRESENCE )
@ -441,22 +440,22 @@ if (USE_DISCORD_PRESENCE)
d i s c o r d _ i m p l . c p p
d i s c o r d _ i m p l . h
)
target_link_libraries ( yuzu PRIVATE DiscordRPC::discord-rpc httplib::httplib Qt ${ QT_MAJOR_VERSION } ::Network )
target_compile_definitions ( yuzu PRIVATE -D USE_DISCORD_PRESENCE)
target_link_libraries ( yuzu PRIVATE DiscordRPC::discord-rpc httplib::httplib Qt6 ::Network )
target_compile_definitions ( yuzu PRIVATE USE_DISCORD_PRESENCE )
endif ( )
if ( ENABLE_WEB_SERVICE )
target_compile_definitions ( yuzu PRIVATE -D ENABLE_WEB_SERVICE)
target_compile_definitions ( yuzu PRIVATE ENABLE_WEB_SERVICE )
endif ( )
if ( YUZU_USE_QT_MULTIMEDIA )
target_link_libraries ( yuzu PRIVATE Qt ${ QT_MAJOR_VERSION } ::Multimedia )
target_compile_definitions ( yuzu PRIVATE -D YUZU_USE_QT_MULTIMEDIA)
target_link_libraries ( yuzu PRIVATE Qt6 ::Multimedia )
target_compile_definitions ( yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA )
endif ( )
if ( YUZU_USE_QT_WEB_ENGINE )
target_link_libraries ( yuzu PRIVATE Qt ${ QT_MAJOR_VERSION } ::WebEngineCore Qt ${ QT_MAJOR_VERSION } ::WebEngineWidgets )
target_compile_definitions ( yuzu PRIVATE -D YUZU_USE_QT_WEB_ENGINE)
target_link_libraries ( yuzu PRIVATE Qt6::WebEngineCore Qt6 ::WebEngineWidgets )
target_compile_definitions ( yuzu PRIVATE YUZU_USE_QT_WEB_ENGINE )
endif ( )
if ( UNIX AND NOT APPLE )
@ -468,6 +467,7 @@ if (WIN32 AND NOT YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_GREATER_EQUAL 6)
add_custom_command ( TARGET yuzu POST_BUILD COMMAND ${ WINDEPLOYQT_EXECUTABLE } "${YUZU_EXE_DIR}/eden.exe" --dir "${YUZU_EXE_DIR}" --libdir "${YUZU_EXE_DIR}" --plugindir "${YUZU_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0 )
endif ( )
# TODO ( crueter ) : t h i s c a n b e d o n e w i t h s y s t e m q t i n a b e t t e r w a y
if ( YUZU_USE_BUNDLED_QT )
include ( CopyYuzuQt6Deps )
copy_yuzu_Qt6_deps ( yuzu )
crueter
6 months ago