zlib: Split thirdparty files, simplify scons option

This commit is contained in:
Rémi Verschelde 2016-10-14 18:58:24 +02:00
parent 36738ddda4
commit cbf52606f4
36 changed files with 57 additions and 49 deletions

View File

@ -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'])

4
drivers/SCsub vendored
View File

@ -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");

View File

@ -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')

24
drivers/zlib/SCsub Normal file
View File

@ -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])

View File

@ -34,7 +34,6 @@ def get_flags():
return [
('tools', 'no'),
('builtin_zlib', 'no'),
('openssl', 'builtin'), #use builtin openssl
]

View File

@ -33,6 +33,7 @@ def get_flags():
return [
('tools', 'no'),
('builtin_zlib', 'yes'),
('module_theora_enabled', 'no'),
]

View File

@ -23,7 +23,6 @@ def get_opts():
def get_flags():
return [
('builtin_zlib', 'no'),
]
def configure(env):

View File

@ -38,6 +38,7 @@ def get_flags():
return [
('tools', 'no'),
('webp', 'yes'),
('builtin_zlib', 'yes'),
('openssl','builtin'), #use builtin openssl
]

View File

@ -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'),

View File

@ -28,7 +28,6 @@ def get_opts():
def get_flags():
return [
('builtin_zlib', 'no'),
]

View File

@ -27,7 +27,6 @@ def get_opts():
def get_flags():
return [
('builtin_zlib', 'no'),
]

View File

@ -176,6 +176,7 @@ def get_opts():
def get_flags():
return [
('builtin_zlib', 'yes'),
('openssl','builtin'), #use builtin openssl
]

View File

@ -29,6 +29,7 @@ def get_flags():
return [
('tools', 'no'),
('builtin_zlib', 'yes'),
('openssl', 'builtin'),
]

View File

@ -68,7 +68,6 @@ def get_opts():
def get_flags():
return [
('builtin_zlib', 'no'),
("openssl", "system"),
('freetype','yes'), # use system freetype
('libpng', 'system'),

42
thirdparty/README.md vendored
View File

@ -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*`