From 459502e48ccb6607e531112e7ae89f62b75023c8 Mon Sep 17 00:00:00 2001
From: darkf
Date: Fri, 28 Nov 2014 21:38:20 -0800
Subject: Fix MinGW build

---
 src/citra/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/citra')

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()
 
 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 (APPLE)
     target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY})
 elseif (WIN32)
     target_link_libraries(citra winmm)
+    if (MINGW)
+        target_link_libraries(citra iconv)
+    endif()    
 else() # Unix
     target_link_libraries(citra pthread rt)
     target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
-- 
cgit v1.2.3


From 5d10b212ecebb15fb1463edc08c725d8e29fa44a Mon Sep 17 00:00:00 2001
From: darkf
Date: Mon, 29 Dec 2014 19:59:14 -0800
Subject: Fix MSVC-related #defines and add CMakeLists comment

---
 src/citra/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/citra')

diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 0e03212d7..dc5e04bfc 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -24,7 +24,7 @@ if (APPLE)
     target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY})
 elseif (WIN32)
     target_link_libraries(citra winmm)
-    if (MINGW)
+    if (MINGW) # GCC does not support codecvt, so use iconv instead
         target_link_libraries(citra iconv)
     endif()    
 else() # Unix
-- 
cgit v1.2.3