summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SConstruct4
-rw-r--r--drivers/SCsub4
-rw-r--r--drivers/builtin_zlib/SCsub22
-rw-r--r--drivers/zlib/SCsub24
-rw-r--r--platform/android/detect.py1
-rw-r--r--platform/bb10/detect.py1
-rw-r--r--platform/haiku/detect.py1
-rw-r--r--platform/iphone/detect.py1
-rw-r--r--platform/javascript/detect.py1
-rw-r--r--platform/osx/detect.py1
-rw-r--r--platform/server/detect.py1
-rw-r--r--platform/windows/detect.py1
-rw-r--r--platform/winrt/detect.py1
-rw-r--r--platform/x11/detect.py1
-rw-r--r--thirdparty/README.md42
-rw-r--r--thirdparty/zlib/adler32.c (renamed from drivers/builtin_zlib/zlib/adler32.c)0
-rw-r--r--thirdparty/zlib/compress.c (renamed from drivers/builtin_zlib/zlib/compress.c)0
-rw-r--r--thirdparty/zlib/crc32.c (renamed from drivers/builtin_zlib/zlib/crc32.c)0
-rw-r--r--thirdparty/zlib/crc32.h (renamed from drivers/builtin_zlib/zlib/crc32.h)0
-rw-r--r--thirdparty/zlib/deflate.c (renamed from drivers/builtin_zlib/zlib/deflate.c)0
-rw-r--r--thirdparty/zlib/deflate.h (renamed from drivers/builtin_zlib/zlib/deflate.h)0
-rw-r--r--thirdparty/zlib/infback.c (renamed from drivers/builtin_zlib/zlib/infback.c)0
-rw-r--r--thirdparty/zlib/inffast.c (renamed from drivers/builtin_zlib/zlib/inffast.c)0
-rw-r--r--thirdparty/zlib/inffast.h (renamed from drivers/builtin_zlib/zlib/inffast.h)0
-rw-r--r--thirdparty/zlib/inffixed.h (renamed from drivers/builtin_zlib/zlib/inffixed.h)0
-rw-r--r--thirdparty/zlib/inflate.c (renamed from drivers/builtin_zlib/zlib/inflate.c)0
-rw-r--r--thirdparty/zlib/inflate.h (renamed from drivers/builtin_zlib/zlib/inflate.h)0
-rw-r--r--thirdparty/zlib/inftrees.c (renamed from drivers/builtin_zlib/zlib/inftrees.c)0
-rw-r--r--thirdparty/zlib/inftrees.h (renamed from drivers/builtin_zlib/zlib/inftrees.h)0
-rw-r--r--thirdparty/zlib/trees.c (renamed from drivers/builtin_zlib/zlib/trees.c)0
-rw-r--r--thirdparty/zlib/trees.h (renamed from drivers/builtin_zlib/zlib/trees.h)0
-rw-r--r--thirdparty/zlib/uncompr.c (renamed from drivers/builtin_zlib/zlib/uncompr.c)0
-rw-r--r--thirdparty/zlib/zconf.h (renamed from drivers/builtin_zlib/zlib/zconf.h)0
-rw-r--r--thirdparty/zlib/zlib.h (renamed from drivers/builtin_zlib/zlib/zlib.h)0
-rw-r--r--thirdparty/zlib/zutil.c (renamed from drivers/builtin_zlib/zlib/zutil.c)0
-rw-r--r--thirdparty/zlib/zutil.h (renamed from drivers/builtin_zlib/zlib/zutil.h)0
36 files changed, 57 insertions, 49 deletions
diff --git a/SConstruct b/SConstruct
index 872b30738c..dd780409d5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -129,7 +129,6 @@ opts.Add('freetype','Freetype support in editor','builtin')
opts.Add('xml','XML Save/Load support (yes/no)','yes')
opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin')
opts.Add('libwebp','libwebp library for webp module (system/builtin)','builtin')
-opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes')
opts.Add('openssl','OpenSSL library for openssl module (system/builtin)','builtin')
opts.Add('libmpcdec','libmpcdec library for mpc module (system/builtin)','builtin')
opts.Add('enet','ENet library (system/builtin)','builtin')
@@ -319,9 +318,6 @@ if selected_platform in platform_list:
if (env.use_ptrcall):
env.Append(CPPFLAGS=['-DPTRCALL_ENABLED']);
- if (env["builtin_zlib"]=='yes'):
- env.Append(CPPPATH=['#drivers/builtin_zlib/zlib'])
-
# to test 64 bits compiltion
# env.Append(CPPFLAGS=['-m64'])
diff --git a/drivers/SCsub b/drivers/SCsub
index bc0d948f41..edab83cd86 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -15,8 +15,8 @@ SConscript('gles2/SCsub');
SConscript('gl_context/SCsub');
SConscript("png/SCsub");
-if (env["builtin_zlib"]=="yes"):
- SConscript("builtin_zlib/SCsub");
+if ("builtin_zlib" in env and env["builtin_zlib"] == "yes"):
+ SConscript("zlib/SCsub");
if (env["platform"] == "windows"):
SConscript("rtaudio/SCsub");
diff --git a/drivers/builtin_zlib/SCsub b/drivers/builtin_zlib/SCsub
deleted file mode 100644
index e5c81c0b3b..0000000000
--- a/drivers/builtin_zlib/SCsub
+++ /dev/null
@@ -1,22 +0,0 @@
-Import('env')
-
-zlib_sources = [
-
- "builtin_zlib/zlib/adler32.c",
- "builtin_zlib/zlib/compress.c",
- "builtin_zlib/zlib/crc32.c",
- "builtin_zlib/zlib/deflate.c",
- "builtin_zlib/zlib/infback.c",
- "builtin_zlib/zlib/inffast.c",
- "builtin_zlib/zlib/inflate.c",
- "builtin_zlib/zlib/inftrees.c",
- "builtin_zlib/zlib/trees.c",
- "builtin_zlib/zlib/uncompr.c",
- "builtin_zlib/zlib/zutil.c",
- ]
-
-
-env.drivers_sources+=zlib_sources
-
-#env.add_source_files("core", png_sources)
-Export('env')
diff --git a/drivers/zlib/SCsub b/drivers/zlib/SCsub
new file mode 100644
index 0000000000..d0bbcd452b
--- /dev/null
+++ b/drivers/zlib/SCsub
@@ -0,0 +1,24 @@
+Import('env')
+
+# Not cloning the env, the includes need to be accessible for core/
+
+# Thirdparty source files
+# No check here as already done in drivers/SCsub
+thirdparty_dir = "#thirdparty/zlib/"
+thirdparty_sources = [
+ "adler32.c",
+ "compress.c",
+ "crc32.c",
+ "deflate.c",
+ "infback.c",
+ "inffast.c",
+ "inflate.c",
+ "inftrees.c",
+ "trees.c",
+ "uncompr.c",
+ "zutil.c",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env.add_source_files(env.drivers_sources, thirdparty_sources)
+env.Append(CPPPATH = [thirdparty_dir])
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 9087d5343e..8d56dbcdaa 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -34,7 +34,6 @@ def get_flags():
return [
('tools', 'no'),
- ('builtin_zlib', 'no'),
('openssl', 'builtin'), #use builtin openssl
]
diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py
index 5aa68b36dc..2b76aa3496 100644
--- a/platform/bb10/detect.py
+++ b/platform/bb10/detect.py
@@ -33,6 +33,7 @@ def get_flags():
return [
('tools', 'no'),
+ ('builtin_zlib', 'yes'),
('module_theora_enabled', 'no'),
]
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index 8aa810e18d..af997a5737 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -23,7 +23,6 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
]
def configure(env):
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 3de0ba0db9..1be63891b1 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -38,6 +38,7 @@ def get_flags():
return [
('tools', 'no'),
('webp', 'yes'),
+ ('builtin_zlib', 'yes'),
('openssl','builtin'), #use builtin openssl
]
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index 19427eff14..e1f91cf948 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -26,6 +26,7 @@ def get_flags():
return [
('tools', 'no'),
+ ('builtin_zlib', 'yes'),
('module_etc1_enabled', 'no'),
('module_mpc_enabled', 'no'),
('module_theora_enabled', 'no'),
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 43ddfa0d1a..2ade097893 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -28,7 +28,6 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
]
diff --git a/platform/server/detect.py b/platform/server/detect.py
index 543c88c5c2..2f6fb00e0d 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -27,7 +27,6 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
]
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index ce308a49c9..af9a0aca41 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -176,6 +176,7 @@ def get_opts():
def get_flags():
return [
+ ('builtin_zlib', 'yes'),
('openssl','builtin'), #use builtin openssl
]
diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index 7f220736d7..79fc3651e9 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -29,6 +29,7 @@ def get_flags():
return [
('tools', 'no'),
+ ('builtin_zlib', 'yes'),
('openssl', 'builtin'),
]
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 3ebefb640c..0c14c29361 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -68,7 +68,6 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
("openssl", "system"),
('freetype','yes'), # use system freetype
('libpng', 'system'),
diff --git a/thirdparty/README.md b/thirdparty/README.md
index 841435b56e..6ed346299b 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -9,7 +9,7 @@
Files extracted from upstream source:
-- all *.c files in the main directory
+- all .c files in the main directory
- the include/enet/ folder as enet/
- LICENSE file
@@ -26,7 +26,7 @@ before the next update.
Files extracted from upstream source:
-- src/glew.c
+- `src/glew.c`
- include/GL/ as GL/
- LICENSE.txt
@@ -39,7 +39,7 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- jpgd.{c,h}
+- `jpgd.{c,h}`
## libmpcdec
@@ -63,8 +63,8 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- src/\*.c
-- include/ogg/\*.h in ogg/
+- `src/*.c`
+- `include/ogg/*.h` in ogg/
- COPYING
@@ -76,11 +76,10 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- all .c and .h files of the main directory, except from:
- * example.c
- * pngtest.c
+- all .c and .h files of the main directory, except from
+ `example.c` and `pngtest.c`
- the arm/ folder
-- scripts/pnglibconf.h.prebuilt as pnglibconf.h
+- `scripts/pnglibconf.h.prebuilt` as `pnglibconf.h`
## libvorbis
@@ -91,8 +90,8 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- src/\* except from: lookups.pl, Makefile.\*
-- include/vorbis/\*.h as vorbis/
+- `src/*` except from: `lookups.pl`, `Makefile.*`
+- `include/vorbis/*.h` as vorbis/
- COPYING
@@ -104,7 +103,7 @@ Files extracted from upstream source:
Files extracted from the upstream source:
-- src/\* except from: \*.am, \*.in, extras/, webp/extras.h
+- `src/*` except from: .am and .in, files, extras/, `webp/extras.h`
- AUTHORS, COPYING, PATENTS
Important: The files `utils/bit_reader.{c,h}` have Godot-made
@@ -132,7 +131,7 @@ TODO.
Files extracted from upstream source:
- all .c and .h files in src/ (both opus and opusfile),
- except opus_demo.c
+ except `opus_demo.c`
- all .h files in include/ (both opus and opusfile)
- COPYING
@@ -145,7 +144,7 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- all .cpp and .h files apart from main.cpp
+- all .cpp and .h files apart from `main.cpp`
- LICENSE.TXT
@@ -157,7 +156,7 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- all of them: rg_etc1.{cpp,h}
+- `rg_etc1.{cpp,h}`
## rtaudio
@@ -168,7 +167,7 @@ Files extracted from upstream source:
Files extracted from upstream source:
-- RtAudio.{cpp,h}
+- `RtAudio.{cpp,h}`
## squish
@@ -193,3 +192,14 @@ Files extracted from upstream source:
- all .c, .h in lib/
- all .h files in include/theora/ as theora/
- COPYING and LICENSE
+
+
+## zlib
+
+- Upstream: http://www.zlib.net/
+- Version: 1.2.8
+- License: zlib
+
+Files extracted from upstream source:
+
+- all .c and .h files apart from `gz*`
diff --git a/drivers/builtin_zlib/zlib/adler32.c b/thirdparty/zlib/adler32.c
index a868f073d8..a868f073d8 100644
--- a/drivers/builtin_zlib/zlib/adler32.c
+++ b/thirdparty/zlib/adler32.c
diff --git a/drivers/builtin_zlib/zlib/compress.c b/thirdparty/zlib/compress.c
index 6e9762676a..6e9762676a 100644
--- a/drivers/builtin_zlib/zlib/compress.c
+++ b/thirdparty/zlib/compress.c
diff --git a/drivers/builtin_zlib/zlib/crc32.c b/thirdparty/zlib/crc32.c
index 979a7190a3..979a7190a3 100644
--- a/drivers/builtin_zlib/zlib/crc32.c
+++ b/thirdparty/zlib/crc32.c
diff --git a/drivers/builtin_zlib/zlib/crc32.h b/thirdparty/zlib/crc32.h
index 9e0c778102..9e0c778102 100644
--- a/drivers/builtin_zlib/zlib/crc32.h
+++ b/thirdparty/zlib/crc32.h
diff --git a/drivers/builtin_zlib/zlib/deflate.c b/thirdparty/zlib/deflate.c
index 696957705b..696957705b 100644
--- a/drivers/builtin_zlib/zlib/deflate.c
+++ b/thirdparty/zlib/deflate.c
diff --git a/drivers/builtin_zlib/zlib/deflate.h b/thirdparty/zlib/deflate.h
index ce0299edd1..ce0299edd1 100644
--- a/drivers/builtin_zlib/zlib/deflate.h
+++ b/thirdparty/zlib/deflate.h
diff --git a/drivers/builtin_zlib/zlib/infback.c b/thirdparty/zlib/infback.c
index f3833c2e43..f3833c2e43 100644
--- a/drivers/builtin_zlib/zlib/infback.c
+++ b/thirdparty/zlib/infback.c
diff --git a/drivers/builtin_zlib/zlib/inffast.c b/thirdparty/zlib/inffast.c
index bda59ceb6a..bda59ceb6a 100644
--- a/drivers/builtin_zlib/zlib/inffast.c
+++ b/thirdparty/zlib/inffast.c
diff --git a/drivers/builtin_zlib/zlib/inffast.h b/thirdparty/zlib/inffast.h
index e5c1aa4ca8..e5c1aa4ca8 100644
--- a/drivers/builtin_zlib/zlib/inffast.h
+++ b/thirdparty/zlib/inffast.h
diff --git a/drivers/builtin_zlib/zlib/inffixed.h b/thirdparty/zlib/inffixed.h
index d628327769..d628327769 100644
--- a/drivers/builtin_zlib/zlib/inffixed.h
+++ b/thirdparty/zlib/inffixed.h
diff --git a/drivers/builtin_zlib/zlib/inflate.c b/thirdparty/zlib/inflate.c
index 870f89bb4d..870f89bb4d 100644
--- a/drivers/builtin_zlib/zlib/inflate.c
+++ b/thirdparty/zlib/inflate.c
diff --git a/drivers/builtin_zlib/zlib/inflate.h b/thirdparty/zlib/inflate.h
index 95f4986d40..95f4986d40 100644
--- a/drivers/builtin_zlib/zlib/inflate.h
+++ b/thirdparty/zlib/inflate.h
diff --git a/drivers/builtin_zlib/zlib/inftrees.c b/thirdparty/zlib/inftrees.c
index 44d89cf24e..44d89cf24e 100644
--- a/drivers/builtin_zlib/zlib/inftrees.c
+++ b/thirdparty/zlib/inftrees.c
diff --git a/drivers/builtin_zlib/zlib/inftrees.h b/thirdparty/zlib/inftrees.h
index baa53a0b1a..baa53a0b1a 100644
--- a/drivers/builtin_zlib/zlib/inftrees.h
+++ b/thirdparty/zlib/inftrees.h
diff --git a/drivers/builtin_zlib/zlib/trees.c b/thirdparty/zlib/trees.c
index 1fd7759ef0..1fd7759ef0 100644
--- a/drivers/builtin_zlib/zlib/trees.c
+++ b/thirdparty/zlib/trees.c
diff --git a/drivers/builtin_zlib/zlib/trees.h b/thirdparty/zlib/trees.h
index d35639d82a..d35639d82a 100644
--- a/drivers/builtin_zlib/zlib/trees.h
+++ b/thirdparty/zlib/trees.h
diff --git a/drivers/builtin_zlib/zlib/uncompr.c b/thirdparty/zlib/uncompr.c
index 242e9493df..242e9493df 100644
--- a/drivers/builtin_zlib/zlib/uncompr.c
+++ b/thirdparty/zlib/uncompr.c
diff --git a/drivers/builtin_zlib/zlib/zconf.h b/thirdparty/zlib/zconf.h
index f44af82fc2..f44af82fc2 100644
--- a/drivers/builtin_zlib/zlib/zconf.h
+++ b/thirdparty/zlib/zconf.h
diff --git a/drivers/builtin_zlib/zlib/zlib.h b/thirdparty/zlib/zlib.h
index 3e0c7672ac..3e0c7672ac 100644
--- a/drivers/builtin_zlib/zlib/zlib.h
+++ b/thirdparty/zlib/zlib.h
diff --git a/drivers/builtin_zlib/zlib/zutil.c b/thirdparty/zlib/zutil.c
index 23d2ebef00..23d2ebef00 100644
--- a/drivers/builtin_zlib/zlib/zutil.c
+++ b/thirdparty/zlib/zutil.c
diff --git a/drivers/builtin_zlib/zlib/zutil.h b/thirdparty/zlib/zutil.h
index 24ab06b1cf..24ab06b1cf 100644
--- a/drivers/builtin_zlib/zlib/zutil.h
+++ b/thirdparty/zlib/zutil.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 04:08:03 +0000