Browse Source
fix2
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/2994/head
crueter
3 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
9 additions and
8 deletions
-
src/yuzu/CMakeLists.txt
-
src/yuzu_cmd/CMakeLists.txt
|
|
|
@ -447,7 +447,7 @@ if (YUZU_ROOM) |
|
|
|
target_link_libraries(yuzu PRIVATE Qt6::Widgets) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (YUZU_STATIC_BUILD) |
|
|
|
if (NOT YUZU_STATIC_BUILD) |
|
|
|
# needed for vma |
|
|
|
target_compile_options(yuzu PRIVATE |
|
|
|
-Wno-conversion |
|
|
|
@ -455,4 +455,5 @@ if (YUZU_STATIC_BUILD) |
|
|
|
-Wno-unused-parameter |
|
|
|
-Wno-missing-field-initializers) |
|
|
|
endif() |
|
|
|
|
|
|
|
create_target_directory_groups(yuzu) |
|
|
|
@ -62,11 +62,11 @@ if (YUZU_STATIC_BUILD) |
|
|
|
# At a guess, it's probably because Qt handles the Qt executable for us, whereas this does not |
|
|
|
target_link_options(yuzu-cmd PRIVATE -static -lpthread) |
|
|
|
target_link_options(yuzu-cmd PRIVATE -static-libgcc -static-libstdc++) |
|
|
|
|
|
|
|
# needed for vma |
|
|
|
target_compile_options(yuzu-cmd PRIVATE |
|
|
|
-Wno-conversion |
|
|
|
-Wno-unused-variable |
|
|
|
-Wno-unused-parameter |
|
|
|
-Wno-missing-field-initializers) |
|
|
|
endif() |
|
|
|
|
|
|
|
# needed for vma |
|
|
|
target_compile_options(yuzu-cmd PRIVATE |
|
|
|
-Wno-conversion |
|
|
|
-Wno-unused-variable |
|
|
|
-Wno-unused-parameter |
|
|
|
-Wno-missing-field-initializers) |
