Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
melonDS
Commits
a1f939e0
Commit
a1f939e0
authored
Jul 26, 2020
by
Nadia Holmquist Pedersen
Browse files
use FindIconv and link it on all platforms when not built in
parent
173e3b03
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/frontend/qt_sdl/CMakeLists.txt
View file @
a1f939e0
...
...
@@ -46,6 +46,7 @@ set(CMAKE_AUTORCC ON)
find_package
(
Threads REQUIRED
)
find_package
(
PkgConfig REQUIRED
)
find_package
(
Iconv REQUIRED
)
pkg_check_modules
(
SDL2 REQUIRED sdl2
)
pkg_check_modules
(
SLIRP REQUIRED slirp
)
...
...
@@ -70,6 +71,10 @@ else()
target_link_libraries
(
melonDS
${
SDL2_LIBRARIES
}
${
SLIRP_LIBRARIES
}
)
endif
()
if
(
NOT Iconv_IS_BUILT_IN
)
target_link_libraries
(
melonDS
${
Iconv_LIBRARIES
}
)
endif
()
if
(
UNIX
)
option
(
PORTABLE
"Make a portable build that looks for its configuration in the current directory"
OFF
)
target_link_libraries
(
melonDS dl Qt5::Core Qt5::Gui Qt5::Widgets
)
...
...
@@ -79,7 +84,7 @@ elseif (WIN32)
target_link_libraries
(
melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32
)
if
(
BUILD_STATIC
)
target_link_libraries
(
melonDS imm32 winmm version setupapi -static Qt5::Core Qt5::Gui Qt5::Widgets z zstd
iconv
)
target_link_libraries
(
melonDS imm32 winmm version setupapi -static Qt5::Core Qt5::Gui Qt5::Widgets z zstd
)
else
()
target_link_libraries
(
melonDS Qt5::Core Qt5::Gui Qt5::Widgets
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment