diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/detect.py | 5 | ||||
| -rw-r--r-- | platform/bb10/detect.py | 2 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 9 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 1 | ||||
| -rw-r--r-- | platform/winrt/os_winrt.cpp | 1 |
5 files changed, 2 insertions, 16 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index d0cbe2759..a5640f950 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -34,10 +34,9 @@ def get_flags(): return [ ('tools', 'no'), - ('nedmalloc', 'no'), ('builtin_zlib', 'no'), - ('openssl','builtin'), #use builtin openssl - ] + ('openssl', 'builtin'), #use builtin openssl + ] def create(env): diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py index 9ab94e619..2860b7f09 100644 --- a/platform/bb10/detect.py +++ b/platform/bb10/detect.py @@ -32,9 +32,7 @@ def get_opts(): def get_flags(): return [ - ('lua', 'no'), ('tools', 'no'), - ('nedmalloc', 'no'), ('theora', 'no'), ] diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index d76a20bea..3ff299c5b 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -24,21 +24,12 @@ def get_opts(): def get_flags(): return [ - ('lua', 'no'), ('tools', 'no'), - ('nedmalloc', 'no'), ('theora', 'no'), - ('tools', 'no'), - ('nedmalloc', 'no'), ('musepack', 'no'), - ('squirrel', 'no'), ('squish', 'no'), ('speex', 'no'), - ('old_scenes', 'no'), ('etc1', 'no'), -# ('default_gui_theme', 'no'), - - #('builtin_zlib', 'no'), ] diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 35d90a830..0ca5d3bd0 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -29,7 +29,6 @@ #include "drivers/gles2/rasterizer_gles2.h" #include "os_windows.h" -#include "drivers/nedmalloc/memory_pool_static_nedmalloc.h" #include "drivers/unix/memory_pool_static_malloc.h" #include "os/memory_pool_dynamic_static.h" #include "drivers/windows/thread_windows.h" diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp index f045f54bf..35eb1bb45 100644 --- a/platform/winrt/os_winrt.cpp +++ b/platform/winrt/os_winrt.cpp @@ -28,7 +28,6 @@ /*************************************************************************/ #include "drivers/gles2/rasterizer_gles2.h" #include "os_winrt.h" -#include "drivers/nedmalloc/memory_pool_static_nedmalloc.h" #include "drivers/unix/memory_pool_static_malloc.h" #include "os/memory_pool_dynamic_static.h" #include "thread_winrt.h" |