diff options
| author | LC <mathew1800@gmail.com> | 2020-07-12 18:25:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-12 18:25:10 +0200 |
| commit | ed89bcc767a6c187d834b6b9bb6134190598fc53 (patch) | |
| tree | b17d4aaf8b4550d6433ff28a820046957b7a4172 | |
| parent | Merge pull request #3385 from Morph1984/batch-install (diff) | |
| parent | CMakeLists: Make use of /std:c++latest on MSVC (diff) | |
| download | yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.tar yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.tar.gz yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.tar.bz2 yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.tar.lz yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.tar.xz yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.tar.zst yuzu-ed89bcc767a6c187d834b6b9bb6134190598fc53.zip | |
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/yuzu/game_list.cpp | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 88ea04c08..12c0a4284 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,15 @@ message(STATUS "Target architecture: ${ARCHITECTURE}") # Configure C++ standard # =========================== -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +if (MSVC) + add_compile_options(/std:c++latest) + + # cubeb and boost still make use of deprecated result_of. + add_definitions(-D_HAS_DEPRECATED_RESULT_OF) +else() + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +endif() # Output binaries to bin/ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index bfb600df0..ab7fc7a24 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -531,8 +531,8 @@ void GameList::AddPermDirPopup(QMenu& context_menu, QModelIndex selected) { UISettings::GameDir& game_dir = *selected.data(GameListDir::GameDirRole).value<UISettings::GameDir*>(); - QAction* move_up = context_menu.addAction(tr(u8"\U000025b2 Move Up")); - QAction* move_down = context_menu.addAction(tr(u8"\U000025bc Move Down ")); + QAction* move_up = context_menu.addAction(tr("\u25B2 Move Up")); + QAction* move_down = context_menu.addAction(tr("\u25bc Move Down")); QAction* open_directory_location = context_menu.addAction(tr("Open Directory Location")); const int row = selected.row(); |