vkvg-svg library as submodule

diff --git a/.gitmodules b/.gitmodules
index 5406605718054305f41a44ae2a5bde2944b8e858..d4f21e39f2ecf51329d68c4b7892c08b67fe3bd5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "external/glutess"]
        path = external/glutess
        url = git@github.com:jpbruyere/glutess.git
+[submodule "external/vkvg-svg"]
+       path = external/vkvg-svg
+       url = git@github.com:jpbruyere/vkvg-svg.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 842a23e303b8b1885f249f38b9d0f8bc91f78c07..a00419b20e7ac55119d395171ec1bd3322db01bc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,12 @@ IF (VKVG_FILL_NZ_GLUTESS)
        ADD_DEFINITIONS (-DVKVG_FILL_NZ_GLUTESS)
 ENDIF ()
 
+OPTION(VKVG_SVG "render svg with vkvg-svg library" ON)
+IF (VKVG_SVG)
+       ADD_DEFINITIONS (-DVKVG_SVG)
+ENDIF ()
+
+
 FUNCTION (updateGitSubmodule SUBMOD_NAME)
        MESSAGE(STATUS "Git Submodule ${SUBMOD_NAME} update")
        EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive ${SUBMOD_NAME}
@@ -99,6 +105,9 @@ IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
                IF (VKVG_FILL_NZ_GLUTESS)
                        updateGitSubmodule(external/glutess)
                ENDIF ()
+               IF (VKVG_SVG)
+                       updateGitSubmodule(external/vkvg-svg)
+               ENDIF ()
        endif()
 ENDIF ()
 
@@ -205,6 +214,10 @@ ENDIF()
 IF (VKVG_FILL_NZ_GLUTESS)
        ADD_SUBDIRECTORY (external/glutess)
 ENDIF ()
+IF (VKVG_SVG AND NOT TARGET vkvk-svg)
+       ADD_SUBDIRECTORY (external/vkvg-svg)
+ENDIF()
+
 
 FILE(GLOB VKVG_SRC src/*.c)
 SET (VKVG_PUBLIC_HEADERS "include/vkvg.h;include/vkvg-nsvg.h")
@@ -219,7 +232,6 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
                VERSION ${vkvg_VERSION_MAJOR}.${vkvg_VERSION_MINOR}
                SOVERSION ${vkvg_VERSION_MAJOR}
                C_STANDARD 11
-               #C_EXTENSIONS OFF
                PUBLIC_HEADER "${VKVG_PUBLIC_HEADERS}"
 )
 
@@ -234,6 +246,7 @@ TARGET_INCLUDE_DIRECTORIES("${PROJECT_NAME}"
                ${Vulkan_INCLUDE_DIRS}
                ${CMAKE_CURRENT_SOURCE_DIR}/include
                ${CMAKE_CURRENT_SOURCE_DIR}/vkh/include
+               "$<$<BOOL:${VKVG_SVG}>:${CMAKE_CURRENT_SOURCE_DIR}/external/vkvg-svg/include>"
 )
 TARGET_LINK_LIBRARIES("${PROJECT_NAME}"
        PUBLIC
@@ -245,6 +258,7 @@ TARGET_LINK_LIBRARIES("${PROJECT_NAME}"
                "$<$<BOOL:${VKVG_USE_HARFBUZZ}>:${HarfBuzz_LIBRARIES}>"
                "$<$<BOOL:${VKVG_USE_FONTCONFIG}>:${Fontconfig_LIBRARIES}>"
                "$<$<BOOL:${VKVG_FILL_NZ_GLUTESS}>:glutess>"
+               "$<$<BOOL:${VKVG_SVG}>:vkvg-svg>"
 )
 
 INSTALL(TARGETS "${PROJECT_NAME}"

diff --git a/README.md b/README.md
index a6567f9c0de4f6a0693e5f062c61c495d32e1e44..3e93d1b407071ca94aa4ca18d32f098383dca010 100644 (file)
--- a/README.md
+++ b/README.md
@@ -34,6 +34,9 @@ For API documentation and usage, please refer to the [Cairo](https://www.cairogr
   <a href="https://github.com/jpbruyere/vkvg/blob/master/vkvg-tiger.png">
        <kbd><img src="https://github.com/jpbruyere/vkvg/blob/master/vkvg-tiger.png" height="260"></kbd>
   </a>
+  <a href="https://github.com/jpbruyere/vkvg/blob/master/screenshot3.png">
+       <kbd><img src="https://raw.githubusercontent.com/jpbruyere/vkvg/master/screenshot3.png" height="260"></kbd>
+  </a>
   <a href="https://github.com/jpbruyere/vkvg/blob/master/screenshot1.png">
        <kbd><img src="https://github.com/jpbruyere/vkvg/blob/master/screenshot1.png" height="260"></kbd>
   </a>

diff --git a/external/vkvg-svg b/external/vkvg-svg
new file mode 160000 (submodule)
index 0000000..40415fe
--- /dev/null
+++ b/external/vkvg-svg
@@ -0,0 +1 @@
+Subproject commit 40415fe50e6f863b4abaac1b55c0504f48cf54b3