diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 0b1d0e1a..9dc5c1f3 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -6,7 +6,7 @@ if (MSVC) set(CMAKE_CXX_FLAGS "-O2 /std:c++17") set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) else() - set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpermissive") + set(CMAKE_CXX_FLAGS "-g -O3 -std=c++17 -fpermissive") endif (MSVC) add_definitions(-DSDRPP_IS_CORE) @@ -75,6 +75,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries(sdrpp_core PUBLIC X11) target_link_libraries(sdrpp_core PUBLIC Xxf86vm) target_link_libraries(sdrpp_core PUBLIC dl) + target_link_libraries(sdrpp_core PUBLIC stdc++fs) endif () @@ -113,4 +114,4 @@ target_link_libraries(sdrpp_core PUBLIC volk) set(CORE_FILES ${RUNTIME_OUTPUT_DIRECTORY} PARENT_SCOPE) -# cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/Users/Alex/vcpkg/scripts/buildsystems/vcpkg.cmake" -G "Visual Studio 15 2017 Win64" \ No newline at end of file +# cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/Users/Alex/vcpkg/scripts/buildsystems/vcpkg.cmake" -G "Visual Studio 15 2017 Win64" diff --git a/core/src/core.cpp b/core/src/core.cpp index 0e472955..db5461b6 100644 --- a/core/src/core.cpp +++ b/core/src/core.cpp @@ -139,7 +139,9 @@ int sdrpp_main() { glfwMaximizeWindow(window); } +#if (GLFW_VERSION_MINOR == 3) && (GLFW_VERSION_MINOR >= 2) glfwSetWindowMaximizeCallback(window, maximized_callback); +#endif // Load app icon GLFWimage icons[10]; @@ -300,4 +302,4 @@ int sdrpp_main() { glfwTerminate(); return 0; -} \ No newline at end of file +}