Merge branch 'master' into mtext_feature

LibreCAD · Dec 19, 2020 · 9a979b5 · 9a979b5
2 parents 631def7 + 6cd554f
commit 9a979b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: cpp
 matrix:
   include:
     - os: linux
-      dist: bionic
+      dist: focal
       sudo: false
       compiler: gcc
       addons:

diff --git a/lckernel/CMakeLists.txt b/lckernel/CMakeLists.txt
@@ -274,7 +274,7 @@ add_custom_command(
 )
 
 add_library(lckernel SHARED ${lckernel_srcs} ${lckernel_hdrs})
-target_link_libraries(lckernel ${Boost_LIBRARIES} ${APR_LIBRARIES} ${G_EXTRA_LIBS} tinysplinecxx_shared)
+target_link_libraries(lckernel ${Boost_LIBRARIES} ${APR_LIBRARIES} ${G_EXTRA_LIBS} tinysplinecxx)
 
 # INSTALLATION
 install(TARGETS lckernel 

diff --git a/lckernel/tinyspline b/lckernel/tinyspline