diff --git a/CMakeLists.txt b/CMakeLists.txt index aee843d..40c5e1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,10 +27,15 @@ add_executable(GUI ${SOURCES} ${HEADERS} main/main.cpp src/Statusbar.cpp src/GUI target_link_libraries(GUI ${LIB_PATH}/lib/liblibrary.a) set(FLTK_SKIP_FLUID true) +if(FALSE) +include_directories(../fltk-1.3.5/FL) +link_directories(${PROJECT_NAME} ../fltk-1.3.5/lib) +target_link_libraries(${PROJECT_NAME} fltk) +else() find_package(FLTK REQUIRED) include_directories(${FLTK_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${FLTK_PLATFORM_DEPENDENT_LIBS} ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES}) - +endif() enable_testing() find_package(Catch2 REQUIRED) diff --git a/src/GUI.cpp b/src/GUI.cpp index 62386d2..e90b36d 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -33,7 +33,7 @@ char *get_resolusion(int window_height, int window_width) { str_temp = std::to_string(window_height); strcat(resolusion, str_temp.c_str()); strcat(resolusion, " Width:"); - str_temp = std::to_string(window_height); + str_temp = std::to_string(window_width); strcat(resolusion, str_temp.c_str()); return resolusion; }