summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYRIGHT.txt5
-rw-r--r--modules/svg/SCsub4
-rw-r--r--thirdparty/README.md12
-rw-r--r--thirdparty/nanosvg/README.md2
-rw-r--r--thirdparty/nanosvg/nanosvg.cc (renamed from thirdparty/nanosvg/src/nanosvg.cc)0
-rw-r--r--thirdparty/nanosvg/nanosvg.h (renamed from thirdparty/nanosvg/src/nanosvg.h)0
-rw-r--r--thirdparty/nanosvg/nanosvgrast.h (renamed from thirdparty/nanosvg/src/nanosvgrast.h)0
7 files changed, 19 insertions, 4 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index ef3fd6024e..92e68060c6 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -300,6 +300,11 @@ Copyright: 2001-2011, Xiph.Org, Skype Limited, Octasic,
Erik de Castro Lopo
License: BSD-3-clause
+Files: ./thirdparty/nanosvg/
+Comment: NanoSVG
+Copyright: 2013-2014, Mikko Mononen
+License: Zlib
+
Files: ./thirdparty/pvrtccompressor/
Comment: PvrTcCompressor
Copyright: 2014, Jeffrey Lim.
diff --git a/modules/svg/SCsub b/modules/svg/SCsub
index 0d3a347b7e..062c26cf10 100644
--- a/modules/svg/SCsub
+++ b/modules/svg/SCsub
@@ -3,7 +3,7 @@
Import('env')
# Thirdparty source files
-thirdparty_dir = "#thirdparty/nanosvg/src/"
+thirdparty_dir = "#thirdparty/nanosvg/"
thirdparty_sources = [
"nanosvg.cc"
]
@@ -31,4 +31,4 @@ env.Append(CCFLAGS=["-DSVG_ENABLED"])
# Godot's own source files
env.add_source_files(env.modules_sources, "*.cpp")
-Export('env') \ No newline at end of file
+Export('env')
diff --git a/thirdparty/README.md b/thirdparty/README.md
index ebcd424a54..56b4a07d9b 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -268,6 +268,18 @@ Collection of single-file libraries used in Godot components.
* License: Public Domain (Unlicense) or MIT
+## nanosvg
+
+- Upstream: https://github.com/memononen/nanosvg
+- Version: 9a74da4 (git)
+- License: zlib
+
+Files extracted from the upstream source:
+
+- All .h files in `src/`
+- LICENSE.txt
+
+
## openssl
- Upstream: https://www.openssl.org
diff --git a/thirdparty/nanosvg/README.md b/thirdparty/nanosvg/README.md
deleted file mode 100644
index 919a1ec5e8..0000000000
--- a/thirdparty/nanosvg/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-See:
-https://github.com/memononen/nanosvg
diff --git a/thirdparty/nanosvg/src/nanosvg.cc b/thirdparty/nanosvg/nanosvg.cc
index 3e8e86c792..3e8e86c792 100644
--- a/thirdparty/nanosvg/src/nanosvg.cc
+++ b/thirdparty/nanosvg/nanosvg.cc
diff --git a/thirdparty/nanosvg/src/nanosvg.h b/thirdparty/nanosvg/nanosvg.h
index 2321c56fd2..2321c56fd2 100644
--- a/thirdparty/nanosvg/src/nanosvg.h
+++ b/thirdparty/nanosvg/nanosvg.h
diff --git a/thirdparty/nanosvg/src/nanosvgrast.h b/thirdparty/nanosvg/nanosvgrast.h
index 2940c1f916..2940c1f916 100644
--- a/thirdparty/nanosvg/src/nanosvgrast.h
+++ b/thirdparty/nanosvg/nanosvgrast.h