Merge remote-tracking branch 'gitlab/master'

CMakeLists.txt

@@ -13,16 +13,15 @@ set(PLATFORM_WINDOWS FALSE)
 set(PLATFORM_LINUX FALSE)
 set(PLATFORM_MACOS FALSE)
 
-option(LIBGLTF_BUILD_FOR_UE4 "Build for UE4" OFF)
 option(LIBGLTF_COVERAGE_GCOV "Coverage gcov (debug, Linux builds only)" OFF)
-option(LIBGLTF_TEST_GTEST "Test with gtest" OFF)
+option(LIBGLTF_BUILD_DEBUG_FOR_UE4 "Build for UE4" OFF)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(PLATFORM_WINDOWS TRUE)
     add_definitions(-DPLATFORM_WINDOWS)
     set(DYNAMIC_LIBRARY_EXTENSION ".dll")
     set(STATIC_LIBRARY_EXTENSION ".lib")
-    if(LIBGLTF_BUILD_FOR_UE4)
+    if(LIBGLTF_BUILD_DEBUG_FOR_UE4)
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MD")
     endif()
     if((CMAKE_EXE_LINKER_FLAGS STREQUAL "/machine:X86") OR (CMAKE_EXE_LINKER_FLAGS STREQUAL " /machine:X86"))

docs/CMakeLists.txt

@@ -7,7 +7,7 @@ set(DOC_ROOT_FILE_LIST
     )
 
 set(DOC_HELP_FILE_LIST
-    ${ROOT_PATH}/doc/usage.md
+    ${ROOT_PATH}/docs/usage.md
     )
 
 source_group("root" FILES ${DOC_ROOT_FILE_LIST})

docs/Usage.md

@@ -1 +1,7 @@
 # Usage
+
+Generate the `makefile` or `vs project` by [CMake].
+
+For now, just build to a static library - `libgltf.(lib/a/dylib)`.
+
+[CMake]: https://cmake.org

docs/index.md

@@ -1,20 +1,10 @@
-# libgltf
+# About
 
-[![glTF status](https://img.shields.io/badge/glTF-2%2E0-green.svg?style=flat)](https://github.com/KhronosGroup/glTF)
+This project can automatically generate C++11 code by glTF JSON schema. Then you can compile the generated C++11 code to parser the glTF to a struct `SGlTF` or convert the struct `SGlTF` to JSON string.
 
-[![Follow in twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=flat)](https://twitter.com/C4gIo)
-[![Join gitter at https://gitter.im/code4game/libgltf](https://badges.gitter.im/code4game/libgltf.svg)](https://gitter.im/code4game/libgltf?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Join discord](https://img.shields.io/badge/chat-on%20discord-blue.svg?style=flat)](https://discord.gg/tyEjtQB)
+It was used in [glTFForUE4](https://github.com/code4game/glTFForUE4).
 
-[![Pipeline status](https://gitlab.com/c4g/gltf/libgltf/badges/master/pipeline.svg)](https://gitlab.com/c4g/gltf/libgltf/commits/master)
-[![Build status in linux and macos](https://travis-ci.org/code4game/libgltf.svg?branch=master)](https://travis-ci.org/code4game/libgltf)
-[![Build status in windows](https://ci.appveyor.com/api/projects/status/jkx8aoyafsn9ce4t?svg=true)](https://ci.appveyor.com/project/code4game/libgltf)
-
-[![Coverage report from gitlab-run](https://gitlab.com/c4g/gltf/libgltf/badges/master/coverage.svg)](https://gitlab.com/c4g/gltf/libgltf/commits/master)
-[![Coverage status from coveralls](https://coveralls.io/repos/github/code4game/libgltf/badge.svg?branch=master)](https://coveralls.io/github/code4game/libgltf?branch=master)
-[![Codacy](https://api.codacy.com/project/badge/Grade/fa7ee9a5bc9b4befb703298ca721bc9a)](https://www.codacy.com/app/code4game/libgltf?utm_source=github.com&utm_medium=referral&utm_content=code4game/libgltf&utm_campaign=Badge_Grade)
-[![Maintainability](https://api.codeclimate.com/v1/badges/ade2ac32103a69ba7b85/maintainability)](https://codeclimate.com/github/code4game/libgltf/maintainability)
-[![CII best practices](https://bestpractices.coreinfrastructure.org/projects/1434/badge)](https://bestpractices.coreinfrastructure.org/projects/1434)
+## Donation
 
 [![Become a patreon](https://img.shields.io/badge/donation-become%20a%20patreon-ff69b4.svg?style=flat)](https://www.patreon.com/bePatron?u=7553208)
 [![Patreon invite](https://img.shields.io/badge/donation-patreon%20invite-ff69b4.svg?style=flat)](https://patreon.com/invite/zpdxnv)