VKVM/GUI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

~ fixed resolution indicator in Statusbar

Browse Source
This commit is contained in:
Julian Hinxlage 2019-11-27 12:18:11 +01:00
parent 818ebcdb43
commit 46de465d99
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -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) target_link_libraries(GUI ${LIB_PATH}/lib/liblibrary.a)
set(FLTK_SKIP_FLUID true) 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) find_package(FLTK REQUIRED)
include_directories(${FLTK_INCLUDE_DIR}) include_directories(${FLTK_INCLUDE_DIR})
target_link_libraries(${PROJECT_NAME} ${FLTK_PLATFORM_DEPENDENT_LIBS} ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${FLTK_PLATFORM_DEPENDENT_LIBS} ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES})
endif()
enable_testing() enable_testing()
find_package(Catch2 REQUIRED) find_package(Catch2 REQUIRED)

2
src/GUI.cpp
View File

@ -33,7 +33,7 @@ char *get_resolusion(int window_height, int window_width) {
str_temp = std::to_string(window_height); str_temp = std::to_string(window_height);
strcat(resolusion, str_temp.c_str()); strcat(resolusion, str_temp.c_str());
strcat(resolusion, " Width:"); strcat(resolusion, " Width:");
str_temp = std::to_string(window_height); str_temp = std::to_string(window_width);
strcat(resolusion, str_temp.c_str()); strcat(resolusion, str_temp.c_str());
return resolusion; return resolusion;
} }