diff options
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/citra/citra.rc | bin | 3146 -> 566 bytes |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index b06259f5..94f8d13c 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -2,6 +2,7 @@ set(SRCS emu_window/emu_window_glfw.cpp citra.cpp config.cpp + citra.rc ) set(HEADERS emu_window/emu_window_glfw.h @@ -14,7 +15,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 +25,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() diff --git a/src/citra/citra.rc b/src/citra/citra.rc Binary files differindex c04acc7f..c28e7dbe 100644 --- a/src/citra/citra.rc +++ b/src/citra/citra.rc |