Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
cbf52606
Commit
cbf52606
authored
Oct 14, 2016
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zlib: Split thirdparty files, simplify scons option
parent
36738ddd
Hide whitespace changes
Inline
Side-by-side
Showing
36 changed files
with
57 additions
and
49 deletions
+57
-49
SConstruct
SConstruct
+0
-4
SCsub
drivers/SCsub
+2
-2
SCsub
drivers/builtin_zlib/SCsub
+0
-22
SCsub
drivers/zlib/SCsub
+24
-0
detect.py
platform/android/detect.py
+0
-1
detect.py
platform/bb10/detect.py
+1
-0
detect.py
platform/haiku/detect.py
+0
-1
detect.py
platform/iphone/detect.py
+1
-0
detect.py
platform/javascript/detect.py
+1
-0
detect.py
platform/osx/detect.py
+0
-1
detect.py
platform/server/detect.py
+0
-1
detect.py
platform/windows/detect.py
+1
-0
detect.py
platform/winrt/detect.py
+1
-0
detect.py
platform/x11/detect.py
+0
-1
README.md
thirdparty/README.md
+26
-16
adler32.c
thirdparty/zlib/adler32.c
+0
-0
compress.c
thirdparty/zlib/compress.c
+0
-0
crc32.c
thirdparty/zlib/crc32.c
+0
-0
crc32.h
thirdparty/zlib/crc32.h
+0
-0
deflate.c
thirdparty/zlib/deflate.c
+0
-0
deflate.h
thirdparty/zlib/deflate.h
+0
-0
infback.c
thirdparty/zlib/infback.c
+0
-0
inffast.c
thirdparty/zlib/inffast.c
+0
-0
inffast.h
thirdparty/zlib/inffast.h
+0
-0
inffixed.h
thirdparty/zlib/inffixed.h
+0
-0
inflate.c
thirdparty/zlib/inflate.c
+0
-0
inflate.h
thirdparty/zlib/inflate.h
+0
-0
inftrees.c
thirdparty/zlib/inftrees.c
+0
-0
inftrees.h
thirdparty/zlib/inftrees.h
+0
-0
trees.c
thirdparty/zlib/trees.c
+0
-0
trees.h
thirdparty/zlib/trees.h
+0
-0
uncompr.c
thirdparty/zlib/uncompr.c
+0
-0
zconf.h
thirdparty/zlib/zconf.h
+0
-0
zlib.h
thirdparty/zlib/zlib.h
+0
-0
zutil.c
thirdparty/zlib/zutil.c
+0
-0
zutil.h
thirdparty/zlib/zutil.h
+0
-0
No files found.
SConstruct
View file @
cbf52606
...
...
@@ -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'])
...
...
drivers/SCsub
View file @
cbf52606
...
...
@@ -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");
...
...
drivers/builtin_zlib/SCsub
deleted
100644 → 0
View file @
36738ddd
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')
drivers/zlib/SCsub
0 → 100644
View file @
cbf52606
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])
platform/android/detect.py
View file @
cbf52606
...
...
@@ -34,7 +34,6 @@ def get_flags():
return
[
(
'tools'
,
'no'
),
(
'builtin_zlib'
,
'no'
),
(
'openssl'
,
'builtin'
),
#use builtin openssl
]
...
...
platform/bb10/detect.py
View file @
cbf52606
...
...
@@ -33,6 +33,7 @@ def get_flags():
return
[
(
'tools'
,
'no'
),
(
'builtin_zlib'
,
'yes'
),
(
'module_theora_enabled'
,
'no'
),
]
...
...
platform/haiku/detect.py
View file @
cbf52606
...
...
@@ -23,7 +23,6 @@ def get_opts():
def
get_flags
():
return
[
(
'builtin_zlib'
,
'no'
),
]
def
configure
(
env
):
...
...
platform/iphone/detect.py
View file @
cbf52606
...
...
@@ -38,6 +38,7 @@ def get_flags():
return
[
(
'tools'
,
'no'
),
(
'webp'
,
'yes'
),
(
'builtin_zlib'
,
'yes'
),
(
'openssl'
,
'builtin'
),
#use builtin openssl
]
...
...
platform/javascript/detect.py
View file @
cbf52606
...
...
@@ -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'
),
...
...
platform/osx/detect.py
View file @
cbf52606
...
...
@@ -28,7 +28,6 @@ def get_opts():
def
get_flags
():
return
[
(
'builtin_zlib'
,
'no'
),
]
...
...
platform/server/detect.py
View file @
cbf52606
...
...
@@ -27,7 +27,6 @@ def get_opts():
def
get_flags
():
return
[
(
'builtin_zlib'
,
'no'
),
]
...
...
platform/windows/detect.py
View file @
cbf52606
...
...
@@ -176,6 +176,7 @@ def get_opts():
def
get_flags
():
return
[
(
'builtin_zlib'
,
'yes'
),
(
'openssl'
,
'builtin'
),
#use builtin openssl
]
...
...
platform/winrt/detect.py
View file @
cbf52606
...
...
@@ -29,6 +29,7 @@ def get_flags():
return
[
(
'tools'
,
'no'
),
(
'builtin_zlib'
,
'yes'
),
(
'openssl'
,
'builtin'
),
]
...
...
platform/x11/detect.py
View file @
cbf52606
...
...
@@ -68,7 +68,6 @@ def get_opts():
def
get_flags
():
return
[
(
'builtin_zlib'
,
'no'
),
(
"openssl"
,
"system"
),
(
'freetype'
,
'yes'
),
# use system freetype
(
'libpng'
,
'system'
),
...
...
thirdparty/README.md
View file @
cbf52606
...
...
@@ -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*`
drivers/builtin_zlib
/zlib/adler32.c
→
thirdparty
/zlib/adler32.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/compress.c
→
thirdparty
/zlib/compress.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/crc32.c
→
thirdparty
/zlib/crc32.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/crc32.h
→
thirdparty
/zlib/crc32.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/deflate.c
→
thirdparty
/zlib/deflate.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/deflate.h
→
thirdparty
/zlib/deflate.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/infback.c
→
thirdparty
/zlib/infback.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inffast.c
→
thirdparty
/zlib/inffast.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inffast.h
→
thirdparty
/zlib/inffast.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inffixed.h
→
thirdparty
/zlib/inffixed.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inflate.c
→
thirdparty
/zlib/inflate.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inflate.h
→
thirdparty
/zlib/inflate.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inftrees.c
→
thirdparty
/zlib/inftrees.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/inftrees.h
→
thirdparty
/zlib/inftrees.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/trees.c
→
thirdparty
/zlib/trees.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/trees.h
→
thirdparty
/zlib/trees.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/uncompr.c
→
thirdparty
/zlib/uncompr.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/zconf.h
→
thirdparty
/zlib/zconf.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/zlib.h
→
thirdparty
/zlib/zlib.h
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/zutil.c
→
thirdparty
/zlib/zutil.c
View file @
cbf52606
File moved
drivers/builtin_zlib
/zlib/zutil.h
→
thirdparty
/zlib/zutil.h
View file @
cbf52606
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment