diff options
| author | 2014-11-28 21:38:20 -0800 | |
|---|---|---|
| committer | 2014-11-28 21:38:20 -0800 | |
| commit | 459502e48ccb6607e531112e7ae89f62b75023c8 (patch) | |
| tree | 491c2a24f1496d4abab0d3339e559b9facc74265 /src/citra | |
| parent | Merge pull request #223 from linkmauve/remove-thread (diff) | |
| download | yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.gz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.xz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.zip | |
Fix MinGW build
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index f2add394f..c4cbf9fea 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -19,12 +19,15 @@ endif() | |||
| 19 | 19 | ||
| 20 | add_executable(citra ${SRCS} ${HEADERS}) | 20 | add_executable(citra ${SRCS} ${HEADERS}) |
| 21 | target_link_libraries(citra core common video_core) | 21 | target_link_libraries(citra core common video_core) |
| 22 | target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES} inih) | 22 | target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) |
| 23 | 23 | ||
| 24 | if (APPLE) | 24 | if (APPLE) |
| 25 | target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY}) | 25 | target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY}) |
| 26 | elseif (WIN32) | 26 | elseif (WIN32) |
| 27 | target_link_libraries(citra winmm) | 27 | target_link_libraries(citra winmm) |
| 28 | if (MINGW) | ||
| 29 | target_link_libraries(citra iconv) | ||
| 30 | endif() | ||
| 28 | else() # Unix | 31 | else() # Unix |
| 29 | target_link_libraries(citra pthread rt) | 32 | target_link_libraries(citra pthread rt) |
| 30 | target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) | 33 | target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) |