diff --git a/.gitmodules b/.gitmodules index bb6fb9b4..9a3356df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,9 +14,6 @@ [submodule "external/png"] path = external/png url = https://github.com/HeeroYui/libpng.git -[submodule "external/z/zlib"] - path = external/z/zlib - url = https://github.com/HeeroYui/zlib.git [submodule "external/bullet/bullet"] path = external/bullet/bullet url = https://github.com/HeeroYui/bullet.git diff --git a/external/audio-algo-drain b/external/audio-algo-drain index e3e048f6..fd8d7ab7 160000 --- a/external/audio-algo-drain +++ b/external/audio-algo-drain @@ -1 +1 @@ -Subproject commit e3e048f68a766e9236ea27fb0ee362e0ab6c2770 +Subproject commit fd8d7ab7e8b42dbfe69db699bb00bac2a4341bea diff --git a/external/audio-drain b/external/audio-drain index 154d03e8..ab7f5ac7 160000 --- a/external/audio-drain +++ b/external/audio-drain @@ -1 +1 @@ -Subproject commit 154d03e8bd80bb2e70b6abb4e2675aed9f300bdf +Subproject commit ab7f5ac77121aaa5b7c5690ba47ca9abc0dff497 diff --git a/external/z/lutin_minizip.py b/external/z/lutin_minizip.py deleted file mode 100644 index c5df6729..00000000 --- a/external/z/lutin_minizip.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python -import lutinModule as module -import lutinTools as tools - -def get_desc(): - return "MINIZIP : Small zip interface" - - -def create(target): - myModule = module.Module(__file__, 'minizip', 'LIBRARY') - myModule.add_src_file([ - "zlib/contrib/minizip/unzip.c", - "zlib/contrib/minizip/zip.c", - "zlib/contrib/minizip/miniunz.c", - "zlib/contrib/minizip/ioapi.c"]) - - myModule.add_export_path(tools.get_current_path(__file__) + "/zlib/contrib/") - - myModule.add_module_depend('z') - - myModule.compile_version_CC(1999) - - myModule.compile_flags_CC([ - "-DNOCRYPT", - "-DIOAPI_NO_64"]) - - if target.name=="IOs" or target.name=="MacOs": - myModule.compile_flags_CC("-Wno-implicit-function-declaration") - - # add the currrent module at the - return myModule - - diff --git a/external/z/lutin_z.py b/external/z/lutin_z.py deleted file mode 100644 index edcedd58..00000000 --- a/external/z/lutin_z.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/python -import lutinModule as module -import lutinTools as tools - -def get_desc(): - return "z-lib library (for windows)" - - -def create(target): - if target.name=="Windows": - myModule = module.Module(__file__, 'z', 'LIBRARY') - myModule.add_src_file([ - "zlib/adler32.c", - "zlib/crc32.c", - "zlib/deflate.c", - "zlib/infback.c", - "zlib/inffast.c", - "zlib/inflate.c", - "zlib/inftrees.c", - "zlib/trees.c", - "zlib/zutil.c", - "zlib/compress.c", - "zlib/uncompr.c", - "zlib/gzclose.c", - "zlib/gzlib.c", - "zlib/gzread.c", - "zlib/gzwrite.c"]) - - myModule.add_export_path(tools.get_current_path(__file__)) - myModule.add_export_path(tools.get_current_path(__file__) + "/zlib") - - - myModule.compile_flags_CC([ - "-D_LARGEFILE64_SOURCE=1", - "-DHAVE_HIDDEN"]) - - # add the currrent module at the - return myModule - else: - myModule = module.Module(__file__, 'z', 'PREBUILD') - - myModule.add_export_flag_LD('-lz') - # add the currrent module at the - return myModule - - diff --git a/external/z/zlib b/external/z/zlib deleted file mode 160000 index d28591c2..00000000 --- a/external/z/zlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d28591c2dc88a09473b2ad3f5e82ad20a0dec4b8