Commit Graph

237 Commits

Author SHA1 Message Date
Kevin Ring baa611e19b Hopefully fix problem on macOS. 2023-07-11 10:39:13 +10:00
Kevin Ring e6ce4a9a1d Don't let zlib dirty its repo on configure. 2023-07-10 09:23:24 +10:00
Joseph Kaile 84f2e8f550 automatically unzip data if gzipped data is detected 2023-05-18 13:11:49 -04:00
Hannes Janetzek 0a1bb6c9e9 fix ninja build for libjpeg-turbo
without this ninja doesn't build the target for
cesium-native/extern/libjpeg-turbo/RelWithDebInfo/libturbojpeg.a
automatically. Solution was suggested here
https://cmake.org/pipermail/cmake/2015-November/062055.html
2023-04-26 21:43:35 +02:00
assiduous a1846ae459 Set position-independent code flag for libjpeg-turbo 2023-04-24 09:02:50 -07:00
Joseph Kaile cca075895d use install prefix to set turbojpeg location 2023-04-21 10:49:33 -04:00
Joseph Kaile 715f5b1ae7 if install prefix is set, use it 2023-04-21 10:13:07 -04:00
Joseph Kaile c448b60557 Revert "Revert "add special case if generator is xcode and building for ios""
This reverts commit 8c7b9d9afa.
2023-04-20 18:23:20 -04:00
Joseph Kaile 8c7b9d9afa Revert "add special case if generator is xcode and building for ios"
This reverts commit 97dbde4987.
2023-04-20 18:23:07 -04:00
Joseph Kaile 97dbde4987 add special case if generator is xcode and building for ios 2023-04-20 18:20:09 -04:00
Joseph Kaile 1e3f2ed94e fix issue compiling ios library when using install prefix 2023-04-20 14:19:26 -04:00
Joseph Kaile c3731b3141 revert cmakelist 2023-03-16 13:34:03 -04:00
Joseph Kaile fb150dfd1f revert to checkmark 2023-03-16 10:29:31 -04:00
Joseph Kaile ee26f34a40 go back to external project 2023-03-15 16:09:28 -04:00
Joseph Kaile d103bb813a Revert "switch to add_subdirectory"
This reverts commit d7d3048f4f.
2023-03-15 16:09:00 -04:00
Joseph Kaile 19e0d0039f Revert "don't change the cmake install prefix"
This reverts commit 3b193607c5.
2023-03-15 16:08:43 -04:00
Joseph Kaile 3b193607c5 don't change the cmake install prefix 2023-03-14 16:39:07 -04:00
Joseph Kaile d7d3048f4f switch to add_subdirectory 2023-03-14 15:44:11 -04:00
Joseph Kaile 06bd2cc9db update libjpeg turbo cmakefile 2023-03-14 04:22:26 -04:00
Joseph Kaile 7deb58e20c dont pass system name 2023-03-14 02:36:00 -04:00
Joseph Kaile 4e97b74406 fix library name 2023-03-09 15:10:33 -05:00
Joseph Kaile 07a1eb7941 revert to cmake list that worked 2023-03-09 15:01:05 -05:00
Joseph Kaile 55c5ad1d79 pass system name 2023-03-09 14:17:16 -05:00
Joseph Kaile befa8df2a3 abandon trying to install component 2023-03-09 13:16:37 -05:00
Joseph Kaile 9e598bda38 revert to something to an error i can fix 2023-03-09 04:28:34 -05:00
Joseph Kaile b5a0cbc04a test whehter passing CMAKE_SYSTEM_NAME makes a difference 2023-03-09 02:39:24 -05:00
Joseph Kaile 6fb592814e test whether empty strings in the configure command is breaking everything 2023-03-09 01:04:45 -05:00
Joseph Kaile 387d9a902e undo rearanging order of cmake args 2023-03-08 23:54:42 -05:00
Joseph Kaile f937b5d1a0 dont shadow toolchain variables with empty params from command line 2023-03-08 23:19:14 -05:00
Joseph Kaile cded26ccfa revert last commit 2023-03-08 21:20:11 -05:00
Joseph Kaile de1799ecb1 update libjpegturbo, fixing ue4 macos build 2023-03-08 17:40:11 -05:00
Joseph Kaile b20d0464ea pass osx version directly to libjpegturbo 2023-03-08 02:09:43 -05:00
Joseph Kaile 232c08ccf3 remove stray \ breaking build 2023-03-07 22:44:58 -05:00
Joseph Kaile e08f2740c6 make sure cmake-system-processor is not empty 2023-03-07 20:24:04 -05:00
Joseph Kaile 020dac1d9d install only libjpeg-turbo static library 2023-03-07 18:30:09 -05:00
Joseph Kaile b0d3620596 use generator expression to simplify code a bit 2023-03-06 22:36:05 -05:00
Joseph Kaile 6541b30bb2
pass osx deployment target 2023-03-06 18:10:02 -05:00
Joseph Kaile ea3b028f55 update libjpeg-trubo 2023-03-06 13:58:31 -05:00
Joseph Kaile 039921b5e9 update libjpeg-turbo 2023-03-06 13:37:25 -05:00
Joseph Kaile 06a193d4a9 fix cmake syntax error, address pr comments 2023-03-05 01:55:46 -05:00
Joseph Kaile f0e91283a4 another fix for setting toolchain path.. 2023-03-05 00:32:45 -05:00
Joseph Kaile 18b8102dd3 create absolute path for older cmake versions 2023-03-04 21:37:33 -05:00
Joseph Kaile a443f1f50e pass debug postfix, fix \MT \MD mismatch 2023-03-04 15:32:35 -05:00
Joseph Kaile 9c1fe35158 fix for debug library postfix 2023-03-04 12:32:53 -05:00
Joseph Kaile 3a185757ec fix configure line for older version of cmake? 2023-03-03 22:42:00 -05:00
Joseph Kaile c6a625824a pass debug postfix 2023-03-03 19:43:06 -05:00
Joseph Kaile 0cb080cd83 remove formatting cmake command 2023-03-02 11:12:26 -05:00
Joseph Kaile 856b60d9ed get rid of all executables in libjpeg-turbo 2023-03-01 20:24:29 -05:00
Joseph Kaile 736d16af8b fix for macos and iphone 2023-03-01 20:18:01 -05:00
Joseph Kaile 9750684294 pass generator platform to fix vs2017 build 2023-03-01 12:50:18 -05:00
Joseph Kaile 41c63ad01e change extrnal project add to support android builds 2023-03-01 00:11:27 -05:00
Joseph Kaile e73d4849d2 use msvc not platform_name==windows 2023-02-21 19:45:58 -05:00
Joseph Kaile 4f2516ab42 fix gcc build error 2023-02-21 18:49:22 -05:00
Joseph Kaile 08db323884 make sure lib path isnt dependent on CMAKE_BUILD_TYPE 2023-02-21 15:53:16 -05:00
Joseph Kaile c4f2d04d34 fix build for vs2017 2023-02-21 14:48:00 -05:00
Joseph Kaile dae5cf4b65 skip externalproject install, use build-in-source header/lib path 2023-02-21 13:40:17 -05:00
Joseph Kaile 924449323e install library file 2023-02-21 12:34:28 -05:00
Joseph Kaile f5899fde8d add libjpegturbo license 2023-02-21 12:12:33 -05:00
Joseph Kaile d2662a6d48 fix turbojpeg.h not found error 2023-02-21 00:27:21 -05:00
Joseph Kaile 573025e6e0 add libjpegturbo as external project and create imported target 2023-02-20 13:47:53 -05:00
Joseph Kaile ab9a049cb3 add libjeg-turbo submodule 2023-02-20 13:00:15 -05:00
Kevin Ring 865b8b9dc4 Upgrade tinyxml2. 2023-01-20 15:58:59 +11:00
Kevin Ring 12d74b3834 Revert unnecessary KTX-Software changes. 2022-12-06 12:03:01 +11:00
Kevin Ring b032100f47 Update KTX-Software. 2022-11-17 19:33:48 +11:00
Kevin Ring 77812bc023 Update KTX-Software. 2022-11-17 18:23:16 +11:00
Kevin Ring f31638fbfa Cleaner RasterOverlay error reporting. 2022-10-18 17:59:23 +11:00
Nithin Pranesh 04c1d7613e [skip ci] Revert "uncheck enable simd"
This reverts commit 69569b8afe.
2022-08-31 16:14:05 -04:00
Joseph Kaile 69569b8afe uncheck enable simd 2022-08-31 13:50:14 -04:00
Nithin Pranesh 7c1f3ee45d
Merge branch 'main' into webp-support 2022-08-30 23:21:30 -04:00
Joseph Kaile c3d5d727d2 use version 1.2.4 of libwebp 2022-08-29 17:18:12 -04:00
Joseph Kaile e79136ad4f Add libwebp to cmake 2022-08-17 16:57:36 -04:00
Joseph Kaile 022a11c913 add libwebp submodule 2022-08-17 12:59:16 -04:00
Bao Tran 5aa90be1b8 revert extern libs 2022-06-27 15:13:25 -04:00
Bao Tran b6237eac50 fix libmorton lib warning 2022-05-25 11:24:01 -04:00
Kevin Ring 798e0591fe Downgrade cpp-httplib to v0.10.3.
Later versions up to v0.10.6 have warnings in VS2017 that get treated as
errors and break our build.
2022-05-06 13:32:04 +10:00
Kevin Ring c169008582 Update third party libraries and thirdparty.json. 2022-05-06 12:28:54 +10:00
Bao Tran beee13175c add comment to solve the case where morton index is overflow. Add libmorton 2022-05-03 13:45:45 -04:00
Bao Tran 138d57968c remove entt subdirectory 2022-04-28 12:34:21 -04:00
Bao Tran 2276a957af remove entt submodule 2022-04-28 11:46:04 -04:00
Bao Tran 1b4f7a7ad8 create custom user storage using ecs 2022-04-15 16:47:55 -04:00
Kevin Ring ab433cd2ad Be sure to target iOS 12+. 2022-02-24 11:49:47 +11:00
Kevin Ring dd4f1d70f3 Revert to previous (newer) version of Async++. 2022-02-24 10:48:57 +11:00
Nithin Pranesh 9c889914dd remove commented cmake hack for ktx-software 2022-02-14 10:44:18 -05:00
Nithin Pranesh 53b828a9ca Merge remote-tracking branch 'origin/main' into ktx2-nithin 2021-12-19 17:23:39 -05:00
Sean Lilley 2cdcb92e20 Namespace cleanup 2021-12-02 18:34:22 -05:00
Kevin Ring 962aaddffb Use CesiumGS fork of KTX-Software, fix clang compiler error. 2021-11-30 11:56:01 +11:00
Nithin Pranesh a637a35c69 almost a workaround for some issues with KTX-Software (commented out currently) 2021-11-22 18:07:31 -05:00
Nithin Pranesh b42320ec01 Add KTX-Software as cmake dependency
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-22 03:10:23 -05:00
Ian Lilley 47de191da1 improved precision when using rapidjson 2021-11-12 14:11:42 -05:00
Kevin Ring de1b237a25 Target C++11 for s2geometry.
Apparently it doesn't build when targeting C++17 with Visual Studio.
2021-11-12 20:30:25 +11:00
Kevin Ring c55a550467 Don't disable CXX_EXTENSIONS for s2geometry. 2021-11-12 20:01:51 +11:00
Kevin Ring 9f821fd271 Use C++17 for s2geometry. 2021-11-12 19:41:26 +11:00
Kevin Ring e89bac66f6 Add ability to convert S2 cell to a GlobeRectangle. 2021-11-12 16:33:32 +11:00
Kevin Ring d53a63b2fa Merge remote-tracking branch 'origin/main' into s2 2021-11-09 13:36:30 +11:00
Kevin Ring 3d4d82b38e Add some doc. 2021-11-09 12:35:55 +11:00
Kevin Ring 836def93de Upgrade Catch2 from v2.12.2 to v2.13.7.
This fixes compilation failures on newer Linux versions.
2021-11-07 20:46:58 +11:00
Kevin Ring d8a7e885d2 Fix some Linux build problems.
But it doesn't work yet.
2021-11-05 16:18:05 +11:00
Kevin Ring 92f0d71b51 WIP support for S2 bounding volumes. 2021-11-04 23:58:58 +11:00
Marco Hutter 421bfa201a Removed magic_enum 2021-09-26 15:16:08 +02:00
Marco Hutter c73ec558eb Removed magic_enum dependency
It was only used in CesiumGltfWriter, and is no longer
required after the glTF enum updates
2021-09-26 15:11:57 +02:00