diff options
| author | hnOsmium0001 <[email protected]> | 2022-04-19 12:44:21 -0700 |
|---|---|---|
| committer | hnOsmium0001 <[email protected]> | 2022-04-19 12:44:29 -0700 |
| commit | c8ebee643f23c34ff57f69f8dfcf1903b59ea9d1 (patch) | |
| tree | 180ebc73527d9db9df1a1c021caa889bc834fcdc | |
| parent | 54e2e09ef1203d71e503c79d2eddadfa71b88322 (diff) | |
Fix imgui include path, fix invalid #pragma's
| -rw-r--r-- | 3rdparty/imgui/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/Player.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/3rdparty/imgui/CMakeLists.txt b/3rdparty/imgui/CMakeLists.txt index a82b94f..c9cdc1b 100644 --- a/3rdparty/imgui/CMakeLists.txt +++ b/3rdparty/imgui/CMakeLists.txt @@ -2,7 +2,11 @@ file(GLOB_RECURSE IMGUI_SOURCE ${CMAKE_CURRENT_LIST_DIR}/source/*.cpp) add_library(imgui ${IMGUI_SOURCE} ) -target_include_directories(imgui PUBLIC ${CMAKE_CURRENT_LIST_DIR}/source) +target_include_directories(imgui PUBLIC + ${CMAKE_SOURCE_DIR}/3rdparty/glfw/source/include + ${CMAKE_SOURCE_DIR}/3rdparty/glad/include + ${CMAKE_CURRENT_LIST_DIR}/source +) set_target_properties(imgui PROPERTIES diff --git a/source/Player.cpp b/source/Player.cpp index 47c3ccc..f56d6ea 100644 --- a/source/Player.cpp +++ b/source/Player.cpp @@ -63,7 +63,7 @@ void Player::HandleKeyInput(int key, int action) { } } -#pragma macro_push("PLAYERKEYBINDS_DO_IO") +#pragma push_macro("PLAYERKEYBINDS_DO_IO") #undef PLAYERKEYBINDS_DO_IO #define PLAYERKEYBINDS_DO_IO(function, fieldPrefix) \ function(file, "left=%d\n", fieldPrefix keybinds.keyLeft); \ @@ -98,4 +98,4 @@ bool Player::SaveToFile() { return true; } -#pragma macro_pop("PLAYERKEYBINDS_DO_IO") +#pragma pop_macro("PLAYERKEYBINDS_DO_IO") |