diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/citra/CMakeLists.txt | |
| parent | 74d7b45d09c172bdb6dce665903537a784acb110 (diff) | |
| parent | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (diff) | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/citra/CMakeLists.txt')
| -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 b06259f5e..dc5e04bfc 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -14,7 +14,7 @@ create_directory_groups(${SRCS} ${HEADERS}) add_executable(citra ${SRCS} ${HEADERS}) target_link_libraries(citra core common video_core) -target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES} inih) +target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) if (UNIX) target_link_libraries(citra -pthread) @@ -24,6 +24,9 @@ if (APPLE) target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) elseif (WIN32) target_link_libraries(citra winmm) + if (MINGW) # GCC does not support codecvt, so use iconv instead + target_link_libraries(citra iconv) + endif() else() # Unix target_link_libraries(citra rt) endif() |