Skip to content
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.

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

Improvements to the build process #860

Merged
merged 4 commits into from
Apr 15, 2024
Merged

Improvements to the build process #860

merged 4 commits into from
Apr 15, 2024

Conversation

kring
Copy link
Member

@kring kring commented Apr 14, 2024

  • Upgrade KTX-Software to v4.3.2. See Upgrade to KTX-Software v4.3.2 KTX-Software#1.
  • Use the ktx library instead of ktx_read. While cesium-native currently only needs the read functionality, by depending on ktx_read cesium-native prevents anything that uses cesium-native from bringing in the write functionality. This is because there's no ktx_write. The only options are ktx_read which is read-only, and ktx which includes both. If you try to link against both ktx and ktx_read, you'll end up with multiply-defined symbols.
  • Move the STB image resize implementation code into CesiumGltfReader (instead of CesiumGltfContent). This fixes a weird situation where applications that only depend on CesiumGltfReader would get linker errors.
  • Disable compilation of the KTX CLI by setting KTX_FEATURE_TOOLS to off. This saves a bit of time, and also stops KTX from bringing in its only implementation of cxxopts.

* Use `ktx` library instead of `ktx_read`. The former includes writing
  ability, and there's no library that includes _just_ writing.
* Move STB image resize implementation code into CesiumGltfReader
  (instead of CesiumGltfContent).
Mostly so that KTX-Software doesn't try to pull in cxxopts.
@lilleyse
Copy link
Contributor

  • Move the STB image resize implementation code into CesiumGltfReader (instead of CesiumGltfContent). This fixes a weird situation where applications that only depend on CesiumGltfReader would get linker errors.

Does this fix #813?

@lilleyse
Copy link
Contributor

Looks good!

@lilleyse lilleyse merged commit 46c8b9e into main Apr 15, 2024
14 checks passed
@lilleyse lilleyse deleted the build-tweaks branch April 15, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants