Skip to content

[tools] Add HXCPP_NO_VENDORED flag for system libs #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobil4sk wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −11
Open

[tools] Add HXCPP_NO_VENDORED flag for system libs #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/hx/libs/regexp/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,23 @@
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<cache value="true" asLibrary="true" />

<compilerflag value="-I${PCRE_DIR}"/>
<compilerflag value="-I${PCRE_DIR}" unless="HXCPP_NO_VENDORED" />

<file name="${this_dir}/RegExp.cpp"/>
</files>

<target id="haxe">
<files id="hxcpp_regexp" />
<files id="pcre2-8" />
<files id="pcre2-16" if="hxcpp_smart_strings" />

<section unless="HXCPP_NO_VENDORED">
<files id="pcre2-8" />
<files id="pcre2-16" if="hxcpp_smart_strings" />
</section>

<section if="HXCPP_NO_VENDORED" unless="static_link">
<lib name="-lpcre2-8" />
<lib name="-lpcre2-16" if="hxcpp_smart_strings" />
</section>
</target>

</xml>
12 changes: 8 additions & 4 deletions src/hx/libs/sqlite/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<cache value="true" asLibrary="true" />

<compilerflag value="-I${SQLITE_DIR}"/>

<file name="Sqlite.cpp"/>

<depend name="${SQLITE_DIR}/sqlite3.h" />
<file name="${SQLITE_DIR}/sqlite3.c" tags="" />
<section unless="HXCPP_NO_VENDORED" >
<compilerflag value="-I${SQLITE_DIR}" unless="HXCPP_NO_VENDORED" />

<depend name="${SQLITE_DIR}/sqlite3.h" />
<file name="${SQLITE_DIR}/sqlite3.c" tags="" />
</section>

</files>

<target id="haxe">
<files id="hxcpp_sqlite"/>
<lib name="-lsqlite3" if="HXCPP_NO_VENDORED" unless="static_link" />
<lib name="-lpthread" if="linux" unless="static_link" />
</target>

Expand Down
10 changes: 8 additions & 2 deletions src/hx/libs/ssl/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<cache value="true" asLibrary="true" />

<include name="${HXCPP}/project/thirdparty/mbedtls-flags.xml" />
<include name="${HXCPP}/project/thirdparty/mbedtls-flags.xml" unless="HXCPP_NO_VENDORED" />

<file name="${this_dir}/SSL.cpp"/>
</files>

<target id="haxe">
<!-- the order is important, mbedtls needs to come after hxcpp_ssl -->
<files id="hxcpp_ssl" />
<files id="mbedtls" />
<files id="mbedtls" unless="HXCPP_NO_VENDORED" />

<section if="HXCPP_NO_VENDORED" unless="static_link">
<lib name="-lmbedx509" />
<lib name="-lmbedtls" />
<lib name="-lmbedcrypto" />
</section>

<lib name="advapi32.lib" if="windows" unless="static_link" />
<lib name="crypt32.lib" if="windows" unless="static_link" />
Expand Down
5 changes: 3 additions & 2 deletions src/hx/zip/zlib/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<cache value="true" asLibrary="true" />
<addTwice value="1" />

<compilerflag value="-I${ZLIB_DIR}"/>
<compilerflag value="-I${ZLIB_DIR}" unless="HXCPP_NO_VENDORED" />
<compilerflag value="-I${this_dir}"/>

<file name="ZLibUncompress.cpp"/>
Expand All @@ -48,7 +48,8 @@

<target id="haxe">
<files id="hxcpp_zlib_impl" />
<files id="zlib_sources" unless="HXCPP_LINK_NO_ZLIB"/>
<files id="zlib_sources" unless="HXCPP_LINK_NO_ZLIB || HXCPP_NO_VENDORED"/>
<lib name="-lz" if="HXCPP_NO_VENDORED" unless="static_link" />
</target>

</xml>
Loading