Skip to content

Commit

Permalink
Use hxcpp zlib version instead of local one.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugh Sanderson committed Sep 9, 2024
1 parent c333f65 commit 8f8559f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 56 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "project/toolkit/zlib/zlib"]
path = project/toolkit/zlib/zlib
url = https://github.com/madler/zlib
[submodule "project/toolkit/png/libpng"]
path = project/toolkit/png/libpng
url = https://github.com/pnggroup/libpng
Expand Down
9 changes: 6 additions & 3 deletions project/ToolkitBuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@


<section if="NME_LOCAL_TOOLKIT">
<include name="toolkit/zlib/files.xml" />
<include name="${HXCPP}/src/hx/libs/zlib/Build.xml" />
<set name="NME_ZLIB" value="${ZLIB_DIR}" />

<include name="toolkit/png/files.xml" />
<include name="toolkit/jpeg/files.xml" />
<include name="toolkit/ogg/files.xml" />
Expand Down Expand Up @@ -550,7 +552,7 @@
<set name="NME_SUFFIX" value="${LIBSUFFIX}" unless="HX_TARGET_SUFFIX" />
<set name="NME_SUFFIX" value="" if="macos" />

<set name="HXCPP_LINK_NO_ZLIB" value="1" />
<set name="HXCPP_LINK_NO_ZLIB" value="1" unless="NME_LOCAL_TOOLKIT" />

<target id="${target-id}" output="${LIBPREFIX}nme${NME_SUFFIX}" tool="linker" toolid="${STD_MODULE_LINK}">
<outdir name="${OUT_DIR}/${BINDIR}" />
Expand Down Expand Up @@ -585,7 +587,8 @@
<files id="native-toolkit-jpeg-asm" if="NME_SIMD_D" />
</section>
<files id="native-toolkit-png" />
<files id="native-toolkit-zlib" />
<files id="native-toolkit-zlib" unless="NME_LOCAL_TOOLKIT" />
<files id="hxcpp_zlib" if="NME_LOCAL_TOOLKIT" />
<files id="native-toolkit-angle" if="NME_ANGLE" />
<section if="NME_CURL">
<files id="native-toolkit-curl" />
Expand Down
49 changes: 0 additions & 49 deletions project/toolkit/zlib/files.xml

This file was deleted.

1 change: 0 additions & 1 deletion project/toolkit/zlib/zlib
Submodule zlib deleted from 0f51fb

0 comments on commit 8f8559f

Please sign in to comment.