Skip to content

Commit 5110436

Browse files
authored
Merge pull request #43 from assimp/bugfix/fix_cpp_17_issue
Bugfix/fix cpp 17 issue
2 parents c03e008 + 1eba6ca commit 5110436

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ project(assimp_view)
55

66
find_package(SDL2 CONFIG REQUIRED)
77

8-
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
9-
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
10-
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
8+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
9+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
10+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
11+
set(CMAKE_CXX_STANDARD 17)
1112

1213
SET(OSRE_BUILD_ED OFF CACHE BOOL "no osre ed" )
1314
SET(CPPCORE_BUILD_UNITTESTS OFF CACHE BOOL "no cppcore tests" )

contrib/osre

Submodule osre updated 314 files

src/ModelLoading.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void ModelLoadingApp::onMouseUpdate() {
113113

114114
glm::mat4 localModel = glm::mat4(1.0);
115115
if (mCamera != nullptr) {
116-
if (mouseListener->leftButttonPressed()) {
116+
if (mouseListener->leftButtonPressed()) {
117117
const int diffX = (mMousePos.x - mLastMousePos.x);
118118
const int diffY = (mMousePos.y - mLastMousePos.y);
119119
if (diffX != 0) {
@@ -128,7 +128,7 @@ void ModelLoadingApp::onMouseUpdate() {
128128
mTransformMatrix.mModel *= localModel;
129129
}
130130

131-
if (mouseListener->middleButttonPressed()) {
131+
if (mouseListener->middleButtonPressed()) {
132132
zoom();
133133
}
134134
}

0 commit comments

Comments
 (0)