diff options
| author |  darkf | 2014-12-29 19:59:14 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 20:12:03 -0800 |
| commit | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (patch) | |
| tree | 206a1417e59815789eca81249734b0eb5497d5e3 /src/citra | |
| parent | Fix merge conflicts (diff) | |
| download | yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.gz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.xz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.zip | |
Fix MSVC-related #defines and add CMakeLists comment
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 24 | target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) | 24 | target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) |
| 25 | elseif (WIN32) | 25 | elseif (WIN32) |
| 26 | target_link_libraries(citra winmm) | 26 | target_link_libraries(citra winmm) |
| 27 | if (MINGW) | 27 | if (MINGW) # GCC does not support codecvt, so use iconv instead |
| 28 | target_link_libraries(citra iconv) | 28 | target_link_libraries(citra iconv) |
| 29 | endif() | 29 | endif() |
| 30 | else() # Unix | 30 | else() # Unix |