add option USE_FREETYPE in cmake, update licence dates

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbb80be081dbba812ea6dcb147ee638a1a81ca0b..1fef076c3129bb9306b1641e14f1b0f20c261c5f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,10 +92,18 @@ IF (ENABLE_DBG_UTILS)
        ADD_DEFINITIONS (-DVKVG_DBG_UTILS)
 ENDIF ()
 
-OPTION(VKVG_USE_FONTCONFIG "use FontConfig to resolve font names" ON)
-
 FIND_PACKAGE(Vulkan REQUIRED)
-FIND_PACKAGE(Freetype REQUIRED)
+
+FIND_PACKAGE(Freetype)
+IF (Freetype_FOUND)
+       OPTION(VKVG_USE_FREETYPE "use freetype to load and render font glyphs" ON)
+ELSE ()
+       OPTION(VKVG_USE_FREETYPE "use freetype to load and render font glyphs" OFF)
+       UNSET(VKVG_USE_FREETYPE CACHE)
+ENDIF ()
+IF (VKVG_USE_FREETYPE)
+       ADD_DEFINITIONS (-DVKVG_USE_FREETYPE)
+ENDIF ()
 
 FIND_PACKAGE(Fontconfig)
 IF (Fontconfig_FOUND)
@@ -346,10 +354,15 @@ IF (VKVG_PREMULT_ALPHA)
 ELSE ()
        MESSAGE(STATUS "Premult Alpha\t= disabled.")
 ENDIF ()
+IF (VKVG_USE_FREETYPE)
+       MESSAGE(STATUS "Freetype\t\t= enabled.")
+ELSE ()
+       MESSAGE(STATUS "Freetype\t\t= disabled.")
+ENDIF ()
 IF (VKVG_USE_FONTCONFIG)
-       MESSAGE(STATUS "FontConfig\t\t= enabled.")
+       MESSAGE(STATUS "Fontconfig\t\t= enabled.")
 ELSE ()
-       MESSAGE(STATUS "FontConfig\t\t= disabled.")
+       MESSAGE(STATUS "Fontconfig\t\t= disabled.")
 ENDIF ()
 IF (VKVG_USE_HARFBUZZ)
        MESSAGE(STATUS "Harfbuzz\t\t= enabled.")

diff --git a/shaders/vkvg_main.vert b/shaders/vkvg_main.vert
index 4880bc50c2acfae3b47cfbd6af7d6d401dab0e2f..fd9a68452dc22feaa9fe10a3492df3cfc562dc61 100644 (file)
--- a/shaders/vkvg_main.vert
+++ b/shaders/vkvg_main.vert
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/shaders/vkvg_main_lcd.frag b/shaders/vkvg_main_lcd.frag
index b5dbfea4e201d865c3616887ad3493628f717233..fa0b5a6a17812d110f65e2d8e88a041547fedb3f 100644 (file)
--- a/shaders/vkvg_main_lcd.frag
+++ b/shaders/vkvg_main_lcd.frag
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/cross_mutex.c b/src/cross_mutex.c
index 57de5dc8580c2a092414e7b36c841c2721259291..9e775606053e0077217c3c47f55eb7e120c30986 100644 (file)
--- a/src/cross_mutex.c
+++ b/src/cross_mutex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/cross_mutex.h b/src/cross_mutex.h
index dd86634f95c165e9aeec9249affee2b8c045b2a3..793aeab6aca302fc644511551e1d3b44e3f4a6a1 100644 (file)
--- a/src/cross_mutex.h
+++ b/src/cross_mutex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/cross_os.c b/src/cross_os.c
index 7385eee8ca2002ef4166c95199f4d3ef75b709b8..2aa8b50254609c7ed06889b231583af67004a264 100644 (file)
--- a/src/cross_os.c
+++ b/src/cross_os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/cross_os.h b/src/cross_os.h
index 3025210b2a0c0627a0f3bf1f80556f1f6e15f2b3..1a4386c91b84410e71de8c46c2eaf4efa1a71384 100644 (file)
--- a/src/cross_os.h
+++ b/src/cross_os.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vectors.h b/src/vectors.h
index 0a75828c389cdc9f23a1cd89c2b0a7be2a4b0cd4..25550e4d1cf105a2c10a506d8608600c4f1960c2 100644 (file)
--- a/src/vectors.h
+++ b/src/vectors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_buff.c b/src/vkvg_buff.c
index 402cd9f17daf7eb6e618f9e35fd8047c7ad9a504..531dd6d14a742fd594eb257b0d7fd97dba92a357 100644 (file)
--- a/src/vkvg_buff.c
+++ b/src/vkvg_buff.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_buff.h b/src/vkvg_buff.h
index f7775588b490caf88f272eb64132a335b6c286dd..2917832a1286ddac1686ebc44070a3c2b79e0935 100644 (file)
--- a/src/vkvg_buff.h
+++ b/src/vkvg_buff.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_context_internal.c b/src/vkvg_context_internal.c
index b8419e857ec0894fd8d43f69aab290e8c792ab33..1caba3deaa3d003c4e44ea8c52e5bca06a34bf2f 100644 (file)
--- a/src/vkvg_context_internal.c
+++ b/src/vkvg_context_internal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_device.c b/src/vkvg_device.c
index 03a3a421ea38667f76fa610bc2a9d0f9a5b9db11..37a1c94498ae561f2c9c7127cc4c68d349d3f9d6 100644 (file)
--- a/src/vkvg_device.c
+++ b/src/vkvg_device.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_device_internal.c b/src/vkvg_device_internal.c
index a9d64857722269d3c015b7d1f1eeef8fc93fa3e8..5c3c3a01648a83b36d4ce38dd45e4ce8c95a477c 100644 (file)
--- a/src/vkvg_device_internal.c
+++ b/src/vkvg_device_internal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_device_internal.h b/src/vkvg_device_internal.h
index 5ff8dc9ebedeedceb416539523d0ab984d24bddb..d706416fa82f05dade9ea1e410fc143b2f2adbc2 100644 (file)
--- a/src/vkvg_device_internal.h
+++ b/src/vkvg_device_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_fonts.c b/src/vkvg_fonts.c
index c2e82b6aaba234712b5d84de2a84008eb88396ba..04da1ec5382eb9d53f9fa6ffb696c3cae3edc1f1 100644 (file)
--- a/src/vkvg_fonts.c
+++ b/src/vkvg_fonts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_matrix.c b/src/vkvg_matrix.c
index a76ab36d4edcb4005d64b24fb630c22aa902b94b..d0525f0dd13ed30b5c8d4782c607a2a35f2f1037 100644 (file)
--- a/src/vkvg_matrix.c
+++ b/src/vkvg_matrix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_matrix.h b/src/vkvg_matrix.h
index 9c5c3518f829532639b704f7b308c9572e362069..76077917bccd0bc02edd711d3f9710d71e1f51c3 100644 (file)
--- a/src/vkvg_matrix.h
+++ b/src/vkvg_matrix.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_pattern.c b/src/vkvg_pattern.c
index d8478b397f0de63b3fc6e983ad699cd54ab97074..3460b00e91a31b2bb67b03087ff388d7f3f05e2a 100644 (file)
--- a/src/vkvg_pattern.c
+++ b/src/vkvg_pattern.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/src/vkvg_pattern.h b/src/vkvg_pattern.h
index ea9a026273343011f26efeb41d9f8e7bd6759b4d..3188d9e28ae4d92bc5e87e1183ba63584c1912c0 100644 (file)
--- a/src/vkvg_pattern.h
+++ b/src/vkvg_pattern.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/tests/common/vkengine.h b/tests/common/vkengine.h
index cd705b0e663e2df52bd320e1893e856bb001cd24..93e31a147e082240ab2edfe89efdda6e1c068193 100644 (file)
--- a/tests/common/vkengine.h
+++ b/tests/common/vkengine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/tests/test1.c b/tests/test1.c
index 9ffdd747ddd208e5aa93ffbedb80aba09a45a30d..df454fcc25f3808c832ab6891f32ae3e62e1a100 100644 (file)
--- a/tests/test1.c
+++ b/tests/test1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+ * Copyright (c) 2018-2022 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/vkh b/vkh
index 575aaf77feca1bb15d8aa245c9a64b209f3b8ac1..8fdbe5e40018f3b9b7122015bb456757717e9625 160000 (submodule)
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 575aaf77feca1bb15d8aa245c9a64b209f3b8ac1
+Subproject commit 8fdbe5e40018f3b9b7122015bb456757717e9625