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()