diff --git a/appveyor.yml b/appveyor.yml index 9173ceba..adf9f716 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -115,8 +115,7 @@ configuration: # - Release cache: - - C:/vcpkg/installed/ -> appveyor.yml - - C:/vcpkg/scripts/ -> appveyor.yml + - C:/vcpkg/ -> appveyor.yml build: parallel: true # enable MSBuild parallel builds @@ -140,6 +139,6 @@ build_script: - cd %APPVEYOR_BUILD_FOLDER% - mkdir build - cd build - - cmake %APPVEYOR_BUILD_FOLDER% -G "%generator%" -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/build/package -DBOOST_ROOT="%BOOST_ROOT%" -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DFreeImage_ROOT="c:/vcpkg/installed/x64-windows" + - cmake %APPVEYOR_BUILD_FOLDER% -G "%generator%" -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/build/package -DBOOST_ROOT="%BOOST_ROOT%" -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DFreeImage_ROOT="c:/vcpkg/installed/x64-windows" -DCMAKE_BUILD_TYPE:STRING=%configuration% - cmake --build . --target ALL_BUILD --config %configuration% -- /nologo - cmake --build . --target INSTALL --config %configuration% -- /nologo diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt index 1bfa44cd..bbe907fb 100755 --- a/src/backend/opengl/CMakeLists.txt +++ b/src/backend/opengl/CMakeLists.txt @@ -93,13 +93,17 @@ target_link_libraries(${BackendTarget} glbinding::glbinding $<$>:glbinding::glbinding-aux> glm - Freetype::Freetype Boost::boost backend_interface wtk_interface c_api_interface cpp_api_interface ) +if (FG_ENABLE_HUNTER) + target_link_libraries(${BackendTarget} PRIVATE freetype::freetype) +else () + target_link_libraries(${BackendTarget} PRIVATE Freetype::Freetype) +endif () if(UNIX) target_link_libraries(${BackendTarget} diff --git a/src/backend/opengl/chart_impl.cpp b/src/backend/opengl/chart_impl.cpp index 5fb163cb..3a84182f 100644 --- a/src/backend/opengl/chart_impl.cpp +++ b/src/backend/opengl/chart_impl.cpp @@ -346,7 +346,7 @@ void chart2d_impl::generateChartData() pushPoint(decorData, 1.0f, 0.0f); pushPoint(decorData, 0.0f,-1.0f); pushPoint(decorData, 0.0f, 1.0f); - for (int i=1; i<=ticksLeft; ++i) { + for (int i=1; i decorData; @@ -711,7 +716,7 @@ void chart3d_impl::generateChartData() pushPoint(decorData, 1.0f, 1.0f, 0.0f); pushPoint(decorData, 0.0f, 1.0f,-1.0f); pushPoint(decorData, 0.0f, 1.0f, 1.0f); - for (int i=1; i<=ticksLeft; ++i) { + for (int i=1; i