Browse Source
Merge pull request #4290 from lioncash/latest
CMakeLists: Make use of /std:c++latest on MSVC
pull/15/merge
LC
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
11 additions and
4 deletions
-
CMakeLists.txt
-
src/yuzu/game_list.cpp
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|