From: Jean-Philippe Bruyère Date: Sun, 26 Dec 2021 00:49:50 +0000 (+0100) Subject: add option USE_FREETYPE in cmake, update licence dates X-Git-Tag: v0.3.0-beta~67 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=774911c2d5c1787036e265f3ba59222a6c9fdf36;p=jp%2Fvkvg.git add option USE_FREETYPE in cmake, update licence dates --- diff --git a/CMakeLists.txt b/CMakeLists.txt index bbb80be..1fef076 100644 --- 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 4880bc5..fd9a684 100644 --- a/shaders/vkvg_main.vert +++ b/shaders/vkvg_main.vert @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 b5dbfea..fa0b5a6 100644 --- a/shaders/vkvg_main_lcd.frag +++ b/shaders/vkvg_main_lcd.frag @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 57de5dc..9e77560 100644 --- a/src/cross_mutex.c +++ b/src/cross_mutex.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 dd86634..793aeab 100644 --- a/src/cross_mutex.h +++ b/src/cross_mutex.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 7385eee..2aa8b50 100644 --- a/src/cross_os.c +++ b/src/cross_os.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 3025210..1a4386c 100644 --- a/src/cross_os.h +++ b/src/cross_os.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 0a75828..25550e4 100644 --- a/src/vectors.h +++ b/src/vectors.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 402cd9f..531dd6d 100644 --- a/src/vkvg_buff.c +++ b/src/vkvg_buff.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 f777558..2917832 100644 --- a/src/vkvg_buff.h +++ b/src/vkvg_buff.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 b8419e8..1caba3d 100644 --- a/src/vkvg_context_internal.c +++ b/src/vkvg_context_internal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 03a3a42..37a1c94 100644 --- a/src/vkvg_device.c +++ b/src/vkvg_device.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 a9d6485..5c3c3a0 100644 --- a/src/vkvg_device_internal.c +++ b/src/vkvg_device_internal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 5ff8dc9..d706416 100644 --- a/src/vkvg_device_internal.h +++ b/src/vkvg_device_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 c2e82b6..04da1ec 100644 --- a/src/vkvg_fonts.c +++ b/src/vkvg_fonts.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 a76ab36..d0525f0 100644 --- a/src/vkvg_matrix.c +++ b/src/vkvg_matrix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 9c5c351..7607791 100644 --- a/src/vkvg_matrix.h +++ b/src/vkvg_matrix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 d8478b3..3460b00 100644 --- a/src/vkvg_pattern.c +++ b/src/vkvg_pattern.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 ea9a026..3188d9e 100644 --- a/src/vkvg_pattern.h +++ b/src/vkvg_pattern.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 cd705b0..93e31a1 100644 --- a/tests/common/vkengine.h +++ b/tests/common/vkengine.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 9ffdd74..df454fc 100644 --- a/tests/test1.c +++ b/tests/test1.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Jean-Philippe Bruyère + * Copyright (c) 2018-2022 Jean-Philippe Bruyère * * 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 575aaf7..8fdbe5e 160000 --- a/vkh +++ b/vkh @@ -1 +1 @@ -Subproject commit 575aaf77feca1bb15d8aa245c9a64b209f3b8ac1 +Subproject commit 8fdbe5e40018f3b9b7122015bb456757717e9625