aboutsummaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorRémi Verschelde2016-10-11 23:35:58 +0200
committerRémi Verschelde2016-10-30 14:51:30 +0100
commit55414bc573d7d37e85eff5a7a11a6d72cebe83ba (patch)
treeb98a2897ad663dd299a668db173496a3b28c00a3 /SConstruct
parent819ccdd34075aafcf4fd04069ddcb7e0bdef9ab1 (diff)
downloadgodot-55414bc573d7d37e85eff5a7a11a6d72cebe83ba.tar.gz
godot-55414bc573d7d37e85eff5a7a11a6d72cebe83ba.tar.zst
godot-55414bc573d7d37e85eff5a7a11a6d72cebe83ba.zip
webp: Make it a module and unbundle libwebp thirdparty files
Note that there are two Godot-specific changes made to libwebp for the javascript/HTML5 platform. They are documented in the README.md. (cherry picked from commit ee3cf211c6fd4d1e30617467cdbbe945798a68b3)
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct6
1 files changed, 1 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct
index 479a56a2c..43b9bb604 100644
--- a/SConstruct
+++ b/SConstruct
@@ -130,7 +130,7 @@ opts.Add('freetype','Freetype support in editor','builtin')
opts.Add('speex','Speex Audio (yes/no)','yes')
opts.Add('xml','XML Save/Load support (yes/no)','yes')
opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin')
-opts.Add('webp','WEBP Image loader support (yes/no)','yes')
+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','Use OpenSSL (yes/no/builtin)','no')
opts.Add('musepack','Musepack Audio (yes/no)','yes')
@@ -347,10 +347,6 @@ if selected_platform in platform_list:
env.Append(CPPFLAGS=['-DTHEORA_ENABLED']);
if (env['theoralib']=='yes'):
env.Append(CPPFLAGS=['-DTHEORALIB_ENABLED']);
-
- if (env['webp']=='yes'):
- env.Append(CPPFLAGS=['-DWEBP_ENABLED']);
-
if (env['speex']=='yes'):
env.Append(CPPFLAGS=['-DSPEEX_ENABLED']);