From d243404d4ba88bcf53f7310cc8980b4efe38c19f Mon Sep 17 00:00:00 2001 From: Marijn Tamis Date: Mon, 1 Apr 2019 14:21:09 +0200 Subject: 1.1.6 Release. --- .gitattributes | 2 - Externals/CMakeModules/Android/AndroidCMake.tps | 17 - Externals/CMakeModules/Android/AndroidNdkGdb.cmake | 96 - .../CMakeModules/Android/AndroidNdkModules.cmake | 58 - Externals/CMakeModules/Android/README.md | 240 -- .../CMakeModules/Android/android.toolchain.cmake | 1693 --------- Externals/CMakeModules/Android/ndk_links.md | 211 -- Externals/CMakeModules/FindGoogleTest.cmake | 26 - Externals/CMakeModules/FindNvSimd.cmake | 21 - Externals/CMakeModules/FindPhysX.cmake | 21 - Externals/CMakeModules/FindPxShared.cmake | 17 - Externals/CMakeModules/FindPxToolkit.cmake | 26 - Externals/CMakeModules/FindTarga.cmake | 23 - Externals/CMakeModules/FindnvToolsExt.cmake | 40 - ...rossToolchain.arm-unknown-linux-gnueabihf.cmake | 37 - ...uxCrossToolchain.x86_64-unknown-linux-gnu.cmake | 36 - Externals/CMakeModules/NvidiaBuildOptions.cmake | 180 - Externals/CMakeModules/SetOutputPaths.cmake | 94 - Externals/CMakeModules/ios/ios.toolchain.cmake | 334 -- NvCloth/BuildProjectsIOS.sh | 6 +- NvCloth/BuildProjectsOsx.sh | 10 +- NvCloth/CmakeGenerateAndroid.bat | 17 +- NvCloth/CmakeGenerateProjects.bat | 23 +- .../Externals/CMakeModules/FindGoogleTest.cmake | 28 + NvCloth/Externals/CMakeModules/FindNvSimd.cmake | 21 + NvCloth/Externals/CMakeModules/FindPhysX.cmake | 21 + NvCloth/Externals/CMakeModules/FindPxShared.cmake | 17 + NvCloth/Externals/CMakeModules/FindPxToolkit.cmake | 26 + NvCloth/Externals/CMakeModules/FindTarga.cmake | 23 + .../Externals/CMakeModules/FindnvToolsExt.cmake | 40 + .../CMakeModules/NvidiaBuildOptions.cmake | 180 + .../Externals/CMakeModules/SetOutputPaths.cmake | 94 + .../CMakeModules/android/AndroidCMake.tps | 17 + .../CMakeModules/android/AndroidNdkGdb.cmake | 96 + .../CMakeModules/android/AndroidNdkModules.cmake | 58 + NvCloth/Externals/CMakeModules/android/README.md | 240 ++ .../CMakeModules/android/android.toolchain.cmake | 1693 +++++++++ .../Externals/CMakeModules/android/ndk_links.md | 211 ++ .../Externals/CMakeModules/ios/ios.toolchain.cmake | 334 ++ ...rossToolchain.arm-unknown-linux-gnueabihf.cmake | 37 + ...uxCrossToolchain.x86_64-unknown-linux-gnu.cmake | 36 + NvCloth/FindNvCloth.cmake | 2 +- NvCloth/GenerateProjectsIOS.sh | 10 +- NvCloth/GenerateProjectsLinux.sh | 6 +- NvCloth/GenerateProjectsOsx.sh | 12 +- NvCloth/ReleaseNotes.txt | 32 +- NvCloth/Tools/AuthoringLibrary/CMakeLists.txt | 10 +- .../AuthoringLibrary/CmakeGenerateProjects.bat | 15 +- .../compiler/cmake/AuthoringLibrary.cmake | 1 - .../compiler/cmake/windows/AuthoringLibrary.cmake | 4 +- .../compiler/cmake/windows/CMakeLists.txt | 20 - .../external/CMakeModules/FindPxShared.cmake | 20 - NvCloth/compiler/cmake/android/CMakeLists.txt | 12 - NvCloth/compiler/cmake/android/NvCloth.cmake | 5 + NvCloth/compiler/cmake/common/CMakeLists.txt | 10 +- NvCloth/compiler/cmake/common/NvCloth.cmake | 24 +- NvCloth/compiler/cmake/ios/CMakeLists.txt | 8 +- NvCloth/compiler/cmake/ios/NvCloth.cmake | 5 - NvCloth/compiler/cmake/linux/CMakeLists.txt | 6 - NvCloth/compiler/cmake/linux/NvCloth.cmake | 9 +- NvCloth/compiler/cmake/mac/CMakeLists.txt | 6 - NvCloth/compiler/cmake/mac/NvCloth.cmake | 7 +- NvCloth/compiler/cmake/windows/CMakeLists.txt | 6 - NvCloth/compiler/cmake/windows/NvCloth.cmake | 16 +- .../documentation/CollisionDetection/Index.html | 12 +- .../CollisionDetection/InterCollision.html | 12 +- .../CollisionDetection/SelfCollision.html | 12 +- .../CollisionDetection/SphereCapsuleCollision.html | 12 +- NvCloth/docs/documentation/Compiling/index.html | 12 +- NvCloth/docs/documentation/Cooking/Index.html | 12 +- .../documentation/Cooking/TripletScheduler.html | 12 +- NvCloth/docs/documentation/CopyRight/Index.html | 12 +- NvCloth/docs/documentation/Modules/Index.html | 12 +- NvCloth/docs/documentation/ReleaseNotes/index.html | 12 +- NvCloth/docs/documentation/Solver/Index.html | 12 +- NvCloth/docs/documentation/UserGuide/Index.html | 12 +- NvCloth/docs/documentation/genindex.html | 12 +- NvCloth/docs/documentation/index.html | 14 +- NvCloth/docs/documentation/objects.inv | Bin 205 -> 205 bytes NvCloth/docs/documentation/search.html | 12 +- NvCloth/docs/documentation/searchindex.js | 2 +- .../include/NvClothExt/ClothFabricCooker.h | 1 + NvCloth/extensions/src/ClothFabricCooker.cpp | 5 +- .../extensions/src/ClothGeodesicTetherCooker.cpp | 4 +- NvCloth/extensions/src/ClothMeshQuadifier.cpp | 6 +- NvCloth/include/NvCloth/Allocator.h | 6 +- NvCloth/include/NvCloth/Callbacks.h | 25 +- NvCloth/include/NvCloth/Fabric.h | 2 +- NvCloth/include/NvCloth/Solver.h | 2 +- NvCloth/include/NvCloth/ps/Ps.h | 70 + NvCloth/include/NvCloth/ps/PsAlignedMalloc.h | 88 + NvCloth/include/NvCloth/ps/PsAllocator.cpp | 51 + NvCloth/include/NvCloth/ps/PsAllocator.h | 343 ++ NvCloth/include/NvCloth/ps/PsArray.h | 721 ++++ NvCloth/include/NvCloth/ps/PsAtomic.h | 64 + NvCloth/include/NvCloth/ps/PsBasicTemplates.h | 146 + NvCloth/include/NvCloth/ps/PsBitUtils.h | 109 + NvCloth/include/NvCloth/ps/PsHash.h | 162 + NvCloth/include/NvCloth/ps/PsHashInternals.h | 795 +++++ NvCloth/include/NvCloth/ps/PsHashMap.h | 118 + NvCloth/include/NvCloth/ps/PsIntrinsics.h | 47 + NvCloth/include/NvCloth/ps/PsMathUtils.h | 695 ++++ NvCloth/include/NvCloth/ps/PsUserAllocated.h | 92 + NvCloth/include/NvCloth/ps/unix/PsUnixIntrinsics.h | 153 + .../NvCloth/ps/windows/PsWindowsIntrinsics.h | 189 ++ NvCloth/samples/CmakeGenerateProjects.bat | 17 +- NvCloth/samples/SampleBase/renderer/Mesh.h | 4 +- .../samples/SampleBase/renderer/RenderMaterial.cpp | 5 +- NvCloth/samples/SampleBase/renderer/Renderable.cpp | 3 +- NvCloth/samples/SampleBase/renderer/Renderer.cpp | 4 +- .../SampleBase/renderer/ResourceManager.cpp | 8 +- .../SampleBase/renderer/SkinnedRenderMesh.cpp | 5 +- .../scene/scenes/PlaneCollisionScene.cpp | 2 +- .../SampleBase/scene/scenes/SphereScene.cpp | 4 +- NvCloth/samples/SampleBase/task/PxTask.h | 19 +- .../SampleBase/utils/CallbackImplementations.cpp | 17 - .../SampleBase/utils/CallbackImplementations.h | 1 - .../SampleBase/utils/ClothMeshGenerator.cpp | 2 +- NvCloth/samples/compiler/cmake/SampleBase.cmake | 10 +- .../samples/compiler/cmake/windows/CMakeLists.txt | 33 +- .../compiler/cmake/windows/SampleBase-AT.cmake | 7 +- .../compiler/cmake/windows/SampleBase.cmake | 6 +- .../external/CMakeModules/FindPxShared.cmake | 2 +- NvCloth/scripts/locate_cuda.bat | 4 +- NvCloth/scripts/locate_gw_root.bat | 4 +- NvCloth/src/ClothImpl.h | 2 +- NvCloth/src/IterationState.h | 2 +- NvCloth/src/PhaseConfig.cpp | 2 +- NvCloth/src/SwClothData.cpp | 2 +- NvCloth/src/SwCollision.cpp | 2 +- NvCloth/src/SwFabric.cpp | 4 +- NvCloth/src/SwFabric.h | 2 +- NvCloth/src/SwFactory.cpp | 6 +- NvCloth/src/SwFactory.h | 2 +- NvCloth/src/SwInterCollision.cpp | 2 +- NvCloth/src/SwSolver.cpp | 4 +- NvCloth/src/TripletScheduler.cpp | 2 +- NvCloth/src/cuda/CuCollision.h | 58 +- NvCloth/src/cuda/CuDeviceVector.h | 4 +- NvCloth/src/cuda/CuFabric.cpp | 2 +- NvCloth/src/cuda/CuFactory.h | 2 +- NvCloth/src/cuda/CuSelfCollision.h | 22 +- NvCloth/src/cuda/CuSolver.cpp | 7 +- NvCloth/src/cuda/CuSolverKernel.cu | 3 +- NvCloth/src/dx/DxFabric.cpp | 2 +- NvCloth/src/dx/DxSolver.cpp | 2 +- NvCloth/src/neon/NeonSolverKernel.cpp | 2 +- NvCloth/src/ps/PsAlloca.h | 76 + NvCloth/src/ps/PsFPU.h | 103 + NvCloth/src/ps/PsSort.h | 130 + NvCloth/src/ps/PsSortInternals.h | 187 + NvCloth/src/ps/PsUtilities.h | 169 + NvCloth/src/ps/PxIntrinsics.h | 47 + NvCloth/src/ps/android/cpu-features.c | 1082 ++++++ NvCloth/src/ps/android/cpu-features.h | 208 ++ NvCloth/src/ps/unix/PsUnixAtomic.cpp | 102 + NvCloth/src/ps/unix/PsUnixFPU.h | 69 + NvCloth/src/ps/unix/PsUnixMutex.cpp | 170 + NvCloth/src/ps/windows/PsWindowsAtomic.cpp | 96 + NvCloth/src/ps/windows/PsWindowsFPU.h | 51 + NvCloth/src/ps/windows/PsWindowsInclude.h | 96 + NvCloth/src/scalar/SwCollisionHelpers.h | 2 +- PxShared/.clang-format | 48 - PxShared/GenerateProjects.bat | 49 - .../buildtools/clang-format/clang-format-all.bat | 24 - .../buildtools/clang-format/clang-format-p4.bat | 24 - PxShared/buildtools/clang-format/clang-format.exe | Bin 2377728 -> 0 bytes PxShared/buildtools/clang-format/directories.txt | 4 - PxShared/buildtools/cmake_projects_android.bat | 112 - PxShared/buildtools/cmake_projects_ios.sh | 69 - PxShared/buildtools/cmake_projects_linux.bat | 101 - PxShared/buildtools/cmake_projects_linux.sh | 57 - PxShared/buildtools/cmake_projects_mac.sh | 98 - PxShared/buildtools/cmake_projects_vc12win.bat | 103 - PxShared/buildtools/cmake_projects_vc14ps4.bat | 62 - PxShared/buildtools/cmake_projects_vc14switch.bat | 62 - PxShared/buildtools/cmake_projects_vc14uwp.bat | 100 - PxShared/buildtools/cmake_projects_vc14win.bat | 104 - PxShared/buildtools/cmake_projects_vc14xboxone.bat | 62 - PxShared/buildtools/cmake_projects_vc15ps4.bat | 62 - PxShared/buildtools/cmake_projects_vc15switch.bat | 62 - PxShared/buildtools/cmake_projects_vc15uwp.bat | 101 - PxShared/buildtools/cmake_projects_vc15win.bat | 102 - PxShared/buildtools/cmake_projects_vc15xboxone.bat | 73 - PxShared/buildtools/packman/packman | 80 - PxShared/buildtools/packman/packman.cmd | 41 - PxShared/buildtools/packman/packman_config.txt | 5 - .../buildtools/packman/win-bootstrap/configure.bat | 104 - .../packman/win-bootstrap/fetch_file_from_gtl.ps1 | 43 - .../packman/win-bootstrap/fetch_file_from_s3.cmd | 19 - .../packman/win-bootstrap/fetch_file_from_s3.ps1 | 60 - .../packman/win-bootstrap/fetch_file_from_url.ps1 | 37 - .../win-bootstrap/generate_temp_file_name.ps1 | 2 - .../packman/win-bootstrap/install_package.py | 39 - PxShared/buildtools/steps/build_all_linux.sh | 22 - PxShared/buildtools/steps/build_all_mac.sh | 29 - PxShared/buildtools/steps/build_all_windows.bat | 12 - .../buildtools/steps/build_all_windows_vc12.bat | 60 - .../buildtools/steps/build_all_windows_vc14.bat | 61 - PxShared/buildtools/steps/package_all_linux.sh | 28 - PxShared/buildtools/steps/package_all_mac.sh | 24 - PxShared/buildtools/steps/package_all_ps4.bat | 20 - PxShared/buildtools/steps/package_all_windows.bat | 26 - PxShared/buildtools/steps/package_all_xboxone.bat | 20 - PxShared/buildtools/steps/pre-build_linux.sh | 7 - PxShared/buildtools/steps/pre-build_mac.sh | 7 - PxShared/buildtools/steps/pre-build_ps4.bat | 5 - PxShared/buildtools/steps/pre-build_windows.bat | 6 - PxShared/buildtools/steps/pre-build_xboxone.bat | 5 - PxShared/buildtools/steps/rebuild_all_ps4.bat | 18 - PxShared/buildtools/steps/rebuild_all_xboxone.bat | 17 - PxShared/buildtools/steps/run_tests_linux.sh | 11 - PxShared/buildtools/steps/run_tests_windows.bat | 6 - PxShared/common.pm | 112 - PxShared/dependencies.xml | 62 - PxShared/generate_projects_android.bat | 19 - PxShared/generate_projects_ios.sh | 15 - PxShared/generate_projects_linux.bat | 21 - PxShared/generate_projects_linux.sh | 15 - PxShared/generate_projects_mac.sh | 15 - PxShared/generate_projects_uwp.bat | 25 - PxShared/generate_projects_win.bat | 25 - .../include/cudamanager/PxCudaContextManager.h | 425 --- PxShared/include/cudamanager/PxCudaMemoryManager.h | 281 -- PxShared/include/cudamanager/PxGpuCopyDesc.h | 86 - PxShared/include/cudamanager/PxGpuCopyDescQueue.h | 149 - PxShared/include/filebuf/PxFileBuf.h | 337 -- PxShared/include/foundation/Px.h | 46 +- PxShared/include/foundation/PxAllocatorCallback.h | 46 +- PxShared/include/foundation/PxAssert.h | 95 - PxShared/include/foundation/PxBitAndData.h | 46 +- PxShared/include/foundation/PxBounds3.h | 86 +- PxShared/include/foundation/PxErrorCallback.h | 46 +- PxShared/include/foundation/PxErrors.h | 46 +- PxShared/include/foundation/PxFlags.h | 119 +- PxShared/include/foundation/PxFoundation.h | 158 - PxShared/include/foundation/PxFoundationVersion.h | 65 - PxShared/include/foundation/PxIO.h | 46 +- PxShared/include/foundation/PxIntrinsics.h | 46 +- PxShared/include/foundation/PxMat33.h | 54 +- PxShared/include/foundation/PxMat44.h | 56 +- PxShared/include/foundation/PxMath.h | 50 +- PxShared/include/foundation/PxMathUtils.h | 73 - PxShared/include/foundation/PxMemory.h | 46 +- PxShared/include/foundation/PxPlane.h | 46 +- PxShared/include/foundation/PxPreprocessor.h | 106 +- PxShared/include/foundation/PxProfiler.h | 69 +- PxShared/include/foundation/PxQuat.h | 48 +- PxShared/include/foundation/PxSharedAssert.h | 46 + PxShared/include/foundation/PxSimpleTypes.h | 48 +- PxShared/include/foundation/PxStrideIterator.h | 66 +- PxShared/include/foundation/PxTransform.h | 70 +- PxShared/include/foundation/PxUnionCast.h | 61 +- PxShared/include/foundation/PxVec2.h | 54 +- PxShared/include/foundation/PxVec3.h | 57 +- PxShared/include/foundation/PxVec4.h | 56 +- .../include/foundation/unix/PxUnixIntrinsics.h | 50 +- .../windows/PxWindowsFoundationDelayLoadHook.h | 71 - .../foundation/windows/PxWindowsIntrinsics.h | 50 +- PxShared/include/pvd/PxPvd.h | 193 -- PxShared/include/pvd/PxPvdTransport.h | 129 - .../pvd/windows/PxWindowsPvdDelayLoadHook.h | 60 - PxShared/include/task/PxCpuDispatcher.h | 79 - PxShared/include/task/PxGpuDispatcher.h | 248 -- PxShared/include/task/PxGpuTask.h | 118 - PxShared/include/task/PxTask.h | 335 -- PxShared/include/task/PxTaskDefine.h | 37 - PxShared/include/task/PxTaskManager.h | 231 -- PxShared/src/compiler/cmake/Android/CMakeLists.txt | 46 - .../src/compiler/cmake/Android/PsFastXml.cmake | 24 - .../src/compiler/cmake/Android/PxFoundation.cmake | 46 - PxShared/src/compiler/cmake/Android/PxPvdSDK.cmake | 29 - PxShared/src/compiler/cmake/Android/PxTask.cmake | 24 - PxShared/src/compiler/cmake/CMakeLists.txt | 84 - PxShared/src/compiler/cmake/IOS/CMakeLists.txt | 37 - PxShared/src/compiler/cmake/IOS/PsFastXml.cmake | 22 - PxShared/src/compiler/cmake/IOS/PxFoundation.cmake | 40 - PxShared/src/compiler/cmake/IOS/PxPvdSDK.cmake | 24 - PxShared/src/compiler/cmake/IOS/PxTask.cmake | 18 - PxShared/src/compiler/cmake/Linux/CMakeLists.txt | 90 - PxShared/src/compiler/cmake/Linux/PsFastXml.cmake | 40 - .../cmake/Linux/PxCudaContextManager.cmake | 29 - .../src/compiler/cmake/Linux/PxFoundation.cmake | 67 - PxShared/src/compiler/cmake/Linux/PxPvdSDK.cmake | 53 - PxShared/src/compiler/cmake/Linux/PxTask.cmake | 43 - PxShared/src/compiler/cmake/Mac/CMakeLists.txt | 49 - PxShared/src/compiler/cmake/Mac/PsFastXml.cmake | 22 - PxShared/src/compiler/cmake/Mac/PxFoundation.cmake | 40 - PxShared/src/compiler/cmake/Mac/PxPvdSDK.cmake | 28 - PxShared/src/compiler/cmake/Mac/PxTask.cmake | 18 - .../src/compiler/cmake/Modules/FindPxShared.cmake | 18 - .../compiler/cmake/Modules/FindnvToolsExt.cmake | 38 - PxShared/src/compiler/cmake/PxFoundation.cmake | 171 - PxShared/src/compiler/cmake/RegenProjects.bat | 4 - PxShared/src/compiler/cmake/common/CMakeLists.txt | 82 - PxShared/src/compiler/cmake/common/PsFastXml.cmake | 37 - .../cmake/common/PxCudaContextManager.cmake | 77 - .../src/compiler/cmake/common/PxFoundation.cmake | 118 - PxShared/src/compiler/cmake/common/PxPvdSDK.cmake | 123 - PxShared/src/compiler/cmake/common/PxTask.cmake | 44 - PxShared/src/compiler/cmake/findfileswithspec.py | 23 - PxShared/src/compiler/cmake/html5/CMakeLists.txt | 37 - PxShared/src/compiler/cmake/html5/PsFastXml.cmake | 26 - .../src/compiler/cmake/html5/PxFoundation.cmake | 41 - PxShared/src/compiler/cmake/html5/PxPvdSDK.cmake | 31 - PxShared/src/compiler/cmake/html5/PxTask.cmake | 22 - .../cmake/templates/ProjectVersion.cmake.in | 24 - PxShared/src/compiler/cmake/uwp/CMakeLists.txt | 64 - PxShared/src/compiler/cmake/uwp/PxFoundation.cmake | 97 - PxShared/src/compiler/cmake/windows/CMakeLists.txt | 95 - .../src/compiler/cmake/windows/PsFastXml.cmake | 21 - .../cmake/windows/PxCudaContextManager.cmake | 32 - .../src/compiler/cmake/windows/PxFoundation.cmake | 70 - PxShared/src/compiler/cmake/windows/PxPvdSDK.cmake | 55 - PxShared/src/compiler/cmake/windows/PxTask.cmake | 19 - PxShared/src/compiler/linux32/Makefile | 209 -- .../src/compiler/linux32/Makefile.PsFastXml.mk | 356 -- .../linux32/Makefile.PxCudaContextManager.mk | 391 --- .../src/compiler/linux32/Makefile.PxFoundation.mk | 372 -- PxShared/src/compiler/linux32/Makefile.PxPvdSDK.mk | 386 --- PxShared/src/compiler/linux32/Makefile.PxTask.mk | 352 -- PxShared/src/compiler/linux64/Makefile | 209 -- .../src/compiler/linux64/Makefile.PsFastXml.mk | 356 -- .../linux64/Makefile.PxCudaContextManager.mk | 391 --- .../src/compiler/linux64/Makefile.PxFoundation.mk | 372 -- PxShared/src/compiler/linux64/Makefile.PxPvdSDK.mk | 386 --- PxShared/src/compiler/linux64/Makefile.PxTask.mk | 352 -- PxShared/src/compiler/resource_x64/PxFoundation.rc | Bin 4622 -> 0 bytes PxShared/src/compiler/resource_x64/PxPvdSDK.rc | Bin 4590 -> 0 bytes PxShared/src/compiler/resource_x64/resource.h | 44 - PxShared/src/compiler/resource_x86/PxFoundation.rc | Bin 4622 -> 0 bytes PxShared/src/compiler/resource_x86/PxPvdSDK.rc | Bin 4590 -> 0 bytes PxShared/src/compiler/resource_x86/resource.h | 44 - .../src/cudamanager/include/CudaContextManager.h | 51 - .../src/cudamanager/include/CudaKernelWrangler.h | 331 -- PxShared/src/cudamanager/include/GpuDispatcher.h | 332 -- .../src/cudamanager/include/PhysXDeviceSettings.h | 56 - PxShared/src/cudamanager/src/BlockingWait.cpp | 119 - PxShared/src/cudamanager/src/CUDA/UtilKernels.cu | 164 - .../src/cudamanager/src/CudaContextManager.cpp | 823 ----- .../src/cudamanager/src/CudaKernelWrangler.cpp | 242 -- PxShared/src/cudamanager/src/CudaMemoryManager.cpp | 649 ---- PxShared/src/cudamanager/src/CudaMemoryManager.h | 297 -- .../src/CudaNode3DLowLatencyInterface.h | 128 - PxShared/src/cudamanager/src/GpuDispatcher.cpp | 928 ----- .../src/cudamanager/src/HeapManagerInterface.h | 156 - .../src/cudamanager/src/HeapManagerLinkedList.h | 204 -- PxShared/src/cudamanager/src/HeapManagerRef.cpp | 1380 -------- PxShared/src/cudamanager/src/HeapManagerRef.h | 297 -- PxShared/src/cudamanager/src/PhysXDevice.h | 119 - .../src/cudamanager/src/PhysXDeviceSettings.cpp | 248 -- PxShared/src/fastxml/include/PsFastXml.h | 167 - PxShared/src/fastxml/src/PsFastXml.cpp | 833 ----- PxShared/src/filebuf/include/PsAsciiConversion.h | 99 - PxShared/src/filebuf/include/PsAsciiConversion.inl | 566 ---- PxShared/src/filebuf/include/PsFileBuffer.h | 250 -- PxShared/src/filebuf/include/PsIOStream.h | 137 - PxShared/src/filebuf/include/PsIOStream.inl | 451 --- PxShared/src/filebuf/include/PsMemoryBuffer.h | 449 --- PxShared/src/foundation/doc/PsFoundation.chm | Bin 548596 -> 0 bytes PxShared/src/foundation/doc/Readme.txt | 18 - PxShared/src/foundation/doc/create_docs.cmd | 7 - PxShared/src/foundation/doc/docs.doxyfile | 13 - .../externals/src/android/cpu-features.c | 1082 ------ .../externals/src/android/cpu-features.h | 208 -- PxShared/src/foundation/include/Ps.h | 70 - PxShared/src/foundation/include/PsAlignedMalloc.h | 88 - PxShared/src/foundation/include/PsAlloca.h | 76 - PxShared/src/foundation/include/PsAllocator.h | 367 -- PxShared/src/foundation/include/PsAoS.h | 45 - PxShared/src/foundation/include/PsArray.h | 721 ---- PxShared/src/foundation/include/PsAtomic.h | 63 - PxShared/src/foundation/include/PsBasicTemplates.h | 146 - PxShared/src/foundation/include/PsBitUtils.h | 109 - PxShared/src/foundation/include/PsBroadcast.h | 277 -- PxShared/src/foundation/include/PsCpu.h | 47 - PxShared/src/foundation/include/PsFPU.h | 103 - PxShared/src/foundation/include/PsFoundation.h | 216 -- PxShared/src/foundation/include/PsHash.h | 162 - PxShared/src/foundation/include/PsHashInternals.h | 795 ----- PxShared/src/foundation/include/PsHashMap.h | 118 - PxShared/src/foundation/include/PsHashSet.h | 127 - .../src/foundation/include/PsInlineAllocator.h | 91 - PxShared/src/foundation/include/PsInlineAoS.h | 48 - PxShared/src/foundation/include/PsInlineArray.h | 68 - PxShared/src/foundation/include/PsIntrinsics.h | 47 - PxShared/src/foundation/include/PsMathUtils.h | 694 ---- PxShared/src/foundation/include/PsMutex.h | 330 -- PxShared/src/foundation/include/PsPool.h | 298 -- PxShared/src/foundation/include/PsSList.h | 140 - PxShared/src/foundation/include/PsSocket.h | 186 - PxShared/src/foundation/include/PsSort.h | 130 - PxShared/src/foundation/include/PsSortInternals.h | 188 - PxShared/src/foundation/include/PsString.h | 90 - PxShared/src/foundation/include/PsSync.h | 138 - PxShared/src/foundation/include/PsTempAllocator.h | 62 - PxShared/src/foundation/include/PsThread.h | 382 --- PxShared/src/foundation/include/PsTime.h | 95 - PxShared/src/foundation/include/PsUserAllocated.h | 92 - PxShared/src/foundation/include/PsUtilities.h | 169 - PxShared/src/foundation/include/PsVecMath.h | 1335 -------- .../src/foundation/include/PsVecMathAoSScalar.h | 239 -- .../foundation/include/PsVecMathAoSScalarInline.h | 2259 ------------ PxShared/src/foundation/include/PsVecMathSSE.h | 56 - .../src/foundation/include/PsVecMathUtilities.h | 57 - PxShared/src/foundation/include/PsVecQuat.h | 455 --- PxShared/src/foundation/include/PsVecTransform.h | 283 -- PxShared/src/foundation/include/unix/PsUnixAoS.h | 47 - PxShared/src/foundation/include/unix/PsUnixFPU.h | 69 - .../src/foundation/include/unix/PsUnixInlineAoS.h | 45 - .../src/foundation/include/unix/PsUnixIntrinsics.h | 153 - .../foundation/include/unix/PsUnixTrigConstants.h | 82 - .../foundation/include/unix/neon/PsUnixNeonAoS.h | 129 - .../include/unix/neon/PsUnixNeonInlineAoS.h | 3579 -------------------- .../foundation/include/unix/sse2/PsUnixSse2AoS.h | 179 - .../include/unix/sse2/PsUnixSse2InlineAoS.h | 3223 ------------------ .../src/foundation/include/windows/PsWindowsAoS.h | 131 - .../src/foundation/include/windows/PsWindowsFPU.h | 51 - .../foundation/include/windows/PsWindowsInclude.h | 96 - .../include/windows/PsWindowsInlineAoS.h | 3116 ----------------- .../include/windows/PsWindowsIntrinsics.h | 190 -- .../include/windows/PsWindowsLoadLibrary.h | 72 - .../include/windows/PsWindowsTrigConstants.h | 87 - PxShared/src/foundation/src/PsAllocator.cpp | 124 - PxShared/src/foundation/src/PsAssert.cpp | 90 - PxShared/src/foundation/src/PsFoundation.cpp | 278 -- PxShared/src/foundation/src/PsMathUtils.cpp | 212 -- PxShared/src/foundation/src/PsString.cpp | 185 - PxShared/src/foundation/src/PsTempAllocator.cpp | 129 - PxShared/src/foundation/src/PsUtilities.cpp | 73 - PxShared/src/foundation/src/unix/PsUnixAtomic.cpp | 102 - PxShared/src/foundation/src/unix/PsUnixCpu.cpp | 58 - PxShared/src/foundation/src/unix/PsUnixFPU.cpp | 117 - PxShared/src/foundation/src/unix/PsUnixMutex.cpp | 170 - .../src/foundation/src/unix/PsUnixPrintString.cpp | 52 - PxShared/src/foundation/src/unix/PsUnixSList.cpp | 156 - PxShared/src/foundation/src/unix/PsUnixSocket.cpp | 483 --- PxShared/src/foundation/src/unix/PsUnixSync.cpp | 164 - PxShared/src/foundation/src/unix/PsUnixThread.cpp | 477 --- PxShared/src/foundation/src/unix/PsUnixTime.cpp | 120 - .../src/foundation/src/windows/PsUWPThread.cpp | 339 -- .../src/foundation/src/windows/PsWindowsAtomic.cpp | 96 - .../src/foundation/src/windows/PsWindowsCpu.cpp | 64 - .../src/foundation/src/windows/PsWindowsFPU.cpp | 88 - .../src/foundation/src/windows/PsWindowsMutex.cpp | 161 - .../src/windows/PsWindowsPrintString.cpp | 54 - .../src/foundation/src/windows/PsWindowsSList.cpp | 77 - .../src/foundation/src/windows/PsWindowsSocket.cpp | 446 --- .../src/foundation/src/windows/PsWindowsSync.cpp | 81 - .../src/foundation/src/windows/PsWindowsThread.cpp | 404 --- .../src/foundation/src/windows/PsWindowsTime.cpp | 101 - PxShared/src/pvd/include/PsPvd.h | 85 - .../src/pvd/include/PxProfileAllocatorWrapper.h | 231 -- PxShared/src/pvd/include/PxPvdClient.h | 77 - PxShared/src/pvd/include/PxPvdDataStream.h | 272 -- PxShared/src/pvd/include/PxPvdDataStreamHelpers.h | 120 - PxShared/src/pvd/include/PxPvdErrorCodes.h | 62 - .../src/pvd/include/PxPvdObjectModelBaseTypes.h | 428 --- PxShared/src/pvd/include/PxPvdRenderBuffer.h | 140 - PxShared/src/pvd/include/PxPvdUserRenderer.h | 107 - PxShared/src/pvd/src/PxProfileBase.h | 35 - .../src/pvd/src/PxProfileCompileTimeEventFilter.h | 75 - PxShared/src/pvd/src/PxProfileContextProvider.h | 98 - .../src/pvd/src/PxProfileContextProviderImpl.h | 52 - PxShared/src/pvd/src/PxProfileDataBuffer.h | 167 - PxShared/src/pvd/src/PxProfileDataParsing.h | 218 -- PxShared/src/pvd/src/PxProfileEventBuffer.h | 270 -- PxShared/src/pvd/src/PxProfileEventBufferAtomic.h | 320 -- PxShared/src/pvd/src/PxProfileEventBufferClient.h | 81 - .../pvd/src/PxProfileEventBufferClientManager.h | 94 - PxShared/src/pvd/src/PxProfileEventFilter.h | 93 - PxShared/src/pvd/src/PxProfileEventHandler.h | 99 - PxShared/src/pvd/src/PxProfileEventId.h | 80 - PxShared/src/pvd/src/PxProfileEventImpl.cpp | 230 -- PxShared/src/pvd/src/PxProfileEventMutex.h | 63 - PxShared/src/pvd/src/PxProfileEventNames.h | 90 - PxShared/src/pvd/src/PxProfileEventParser.h | 193 -- PxShared/src/pvd/src/PxProfileEventSender.h | 129 - PxShared/src/pvd/src/PxProfileEventSerialization.h | 258 -- PxShared/src/pvd/src/PxProfileEventSystem.h | 56 - PxShared/src/pvd/src/PxProfileEvents.h | 706 ---- PxShared/src/pvd/src/PxProfileMemory.h | 99 - PxShared/src/pvd/src/PxProfileMemoryBuffer.h | 193 -- PxShared/src/pvd/src/PxProfileMemoryEventBuffer.h | 156 - PxShared/src/pvd/src/PxProfileMemoryEventParser.h | 185 - .../src/pvd/src/PxProfileMemoryEventRecorder.h | 147 - .../pvd/src/PxProfileMemoryEventReflexiveWriter.h | 71 - .../src/pvd/src/PxProfileMemoryEventSummarizer.h | 304 -- PxShared/src/pvd/src/PxProfileMemoryEventTypes.h | 90 - PxShared/src/pvd/src/PxProfileMemoryEvents.h | 411 --- PxShared/src/pvd/src/PxProfileScopedEvent.h | 150 - PxShared/src/pvd/src/PxProfileScopedMutexLock.h | 64 - PxShared/src/pvd/src/PxProfileZone.h | 142 - PxShared/src/pvd/src/PxProfileZoneImpl.h | 318 -- PxShared/src/pvd/src/PxProfileZoneManager.h | 155 - PxShared/src/pvd/src/PxProfileZoneManagerImpl.h | 174 - PxShared/src/pvd/src/PxPvd.cpp | 56 - PxShared/src/pvd/src/PxPvdBits.h | 173 - PxShared/src/pvd/src/PxPvdByteStreams.h | 155 - PxShared/src/pvd/src/PxPvdCommStreamEventSink.h | 55 - PxShared/src/pvd/src/PxPvdCommStreamEvents.h | 987 ------ .../src/pvd/src/PxPvdCommStreamSDKEventTypes.h | 32 - PxShared/src/pvd/src/PxPvdCommStreamTypes.h | 262 -- PxShared/src/pvd/src/PxPvdDataStream.cpp | 870 ----- PxShared/src/pvd/src/PxPvdDefaultFileTransport.cpp | 123 - PxShared/src/pvd/src/PxPvdDefaultFileTransport.h | 77 - .../src/pvd/src/PxPvdDefaultSocketTransport.cpp | 136 - PxShared/src/pvd/src/PxPvdDefaultSocketTransport.h | 79 - PxShared/src/pvd/src/PxPvdFoundation.h | 504 --- PxShared/src/pvd/src/PxPvdImpl.cpp | 405 --- PxShared/src/pvd/src/PxPvdImpl.h | 221 -- PxShared/src/pvd/src/PxPvdInternalByteStreams.h | 147 - PxShared/src/pvd/src/PxPvdMarshalling.h | 220 -- PxShared/src/pvd/src/PxPvdMemClient.cpp | 134 - PxShared/src/pvd/src/PxPvdMemClient.h | 85 - PxShared/src/pvd/src/PxPvdObjectModel.h | 437 --- .../src/pvd/src/PxPvdObjectModelInternalTypeDefs.h | 32 - .../src/pvd/src/PxPvdObjectModelInternalTypes.h | 171 - PxShared/src/pvd/src/PxPvdObjectModelMetaData.cpp | 1515 --------- PxShared/src/pvd/src/PxPvdObjectModelMetaData.h | 495 --- PxShared/src/pvd/src/PxPvdObjectRegistrar.cpp | 80 - PxShared/src/pvd/src/PxPvdObjectRegistrar.h | 71 - PxShared/src/pvd/src/PxPvdProfileZoneClient.cpp | 173 - PxShared/src/pvd/src/PxPvdProfileZoneClient.h | 77 - PxShared/src/pvd/src/PxPvdUserRenderImpl.h | 411 --- PxShared/src/pvd/src/PxPvdUserRenderTypes.h | 46 - PxShared/src/pvd/src/PxPvdUserRenderer.cpp | 460 --- .../pvd/src/windows/PxWindowsPvdDelayLoadHook.cpp | 82 - PxShared/src/task/src/TaskManager.cpp | 701 ---- README.md | 7 +- 530 files changed, 10777 insertions(+), 72105 deletions(-) delete mode 100644 .gitattributes delete mode 100644 Externals/CMakeModules/Android/AndroidCMake.tps delete mode 100644 Externals/CMakeModules/Android/AndroidNdkGdb.cmake delete mode 100644 Externals/CMakeModules/Android/AndroidNdkModules.cmake delete mode 100644 Externals/CMakeModules/Android/README.md delete mode 100644 Externals/CMakeModules/Android/android.toolchain.cmake delete mode 100644 Externals/CMakeModules/Android/ndk_links.md delete mode 100644 Externals/CMakeModules/FindGoogleTest.cmake delete mode 100644 Externals/CMakeModules/FindNvSimd.cmake delete mode 100644 Externals/CMakeModules/FindPhysX.cmake delete mode 100644 Externals/CMakeModules/FindPxShared.cmake delete mode 100644 Externals/CMakeModules/FindPxToolkit.cmake delete mode 100644 Externals/CMakeModules/FindTarga.cmake delete mode 100644 Externals/CMakeModules/FindnvToolsExt.cmake delete mode 100644 Externals/CMakeModules/Linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake delete mode 100644 Externals/CMakeModules/Linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake delete mode 100644 Externals/CMakeModules/NvidiaBuildOptions.cmake delete mode 100644 Externals/CMakeModules/SetOutputPaths.cmake delete mode 100644 Externals/CMakeModules/ios/ios.toolchain.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindGoogleTest.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindNvSimd.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindPhysX.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindPxShared.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindPxToolkit.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindTarga.cmake create mode 100644 NvCloth/Externals/CMakeModules/FindnvToolsExt.cmake create mode 100644 NvCloth/Externals/CMakeModules/NvidiaBuildOptions.cmake create mode 100644 NvCloth/Externals/CMakeModules/SetOutputPaths.cmake create mode 100644 NvCloth/Externals/CMakeModules/android/AndroidCMake.tps create mode 100644 NvCloth/Externals/CMakeModules/android/AndroidNdkGdb.cmake create mode 100644 NvCloth/Externals/CMakeModules/android/AndroidNdkModules.cmake create mode 100644 NvCloth/Externals/CMakeModules/android/README.md create mode 100644 NvCloth/Externals/CMakeModules/android/android.toolchain.cmake create mode 100644 NvCloth/Externals/CMakeModules/android/ndk_links.md create mode 100644 NvCloth/Externals/CMakeModules/ios/ios.toolchain.cmake create mode 100644 NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake create mode 100644 NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake delete mode 100644 NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake create mode 100644 NvCloth/include/NvCloth/ps/Ps.h create mode 100644 NvCloth/include/NvCloth/ps/PsAlignedMalloc.h create mode 100644 NvCloth/include/NvCloth/ps/PsAllocator.cpp create mode 100644 NvCloth/include/NvCloth/ps/PsAllocator.h create mode 100644 NvCloth/include/NvCloth/ps/PsArray.h create mode 100644 NvCloth/include/NvCloth/ps/PsAtomic.h create mode 100644 NvCloth/include/NvCloth/ps/PsBasicTemplates.h create mode 100644 NvCloth/include/NvCloth/ps/PsBitUtils.h create mode 100644 NvCloth/include/NvCloth/ps/PsHash.h create mode 100644 NvCloth/include/NvCloth/ps/PsHashInternals.h create mode 100644 NvCloth/include/NvCloth/ps/PsHashMap.h create mode 100644 NvCloth/include/NvCloth/ps/PsIntrinsics.h create mode 100644 NvCloth/include/NvCloth/ps/PsMathUtils.h create mode 100644 NvCloth/include/NvCloth/ps/PsUserAllocated.h create mode 100644 NvCloth/include/NvCloth/ps/unix/PsUnixIntrinsics.h create mode 100644 NvCloth/include/NvCloth/ps/windows/PsWindowsIntrinsics.h create mode 100644 NvCloth/src/ps/PsAlloca.h create mode 100644 NvCloth/src/ps/PsFPU.h create mode 100644 NvCloth/src/ps/PsSort.h create mode 100644 NvCloth/src/ps/PsSortInternals.h create mode 100644 NvCloth/src/ps/PsUtilities.h create mode 100644 NvCloth/src/ps/PxIntrinsics.h create mode 100644 NvCloth/src/ps/android/cpu-features.c create mode 100644 NvCloth/src/ps/android/cpu-features.h create mode 100644 NvCloth/src/ps/unix/PsUnixAtomic.cpp create mode 100644 NvCloth/src/ps/unix/PsUnixFPU.h create mode 100644 NvCloth/src/ps/unix/PsUnixMutex.cpp create mode 100644 NvCloth/src/ps/windows/PsWindowsAtomic.cpp create mode 100644 NvCloth/src/ps/windows/PsWindowsFPU.h create mode 100644 NvCloth/src/ps/windows/PsWindowsInclude.h delete mode 100644 PxShared/.clang-format delete mode 100644 PxShared/GenerateProjects.bat delete mode 100644 PxShared/buildtools/clang-format/clang-format-all.bat delete mode 100644 PxShared/buildtools/clang-format/clang-format-p4.bat delete mode 100644 PxShared/buildtools/clang-format/clang-format.exe delete mode 100644 PxShared/buildtools/clang-format/directories.txt delete mode 100644 PxShared/buildtools/cmake_projects_android.bat delete mode 100644 PxShared/buildtools/cmake_projects_ios.sh delete mode 100644 PxShared/buildtools/cmake_projects_linux.bat delete mode 100644 PxShared/buildtools/cmake_projects_linux.sh delete mode 100644 PxShared/buildtools/cmake_projects_mac.sh delete mode 100644 PxShared/buildtools/cmake_projects_vc12win.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc14ps4.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc14switch.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc14uwp.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc14win.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc14xboxone.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc15ps4.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc15switch.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc15uwp.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc15win.bat delete mode 100644 PxShared/buildtools/cmake_projects_vc15xboxone.bat delete mode 100644 PxShared/buildtools/packman/packman delete mode 100644 PxShared/buildtools/packman/packman.cmd delete mode 100644 PxShared/buildtools/packman/packman_config.txt delete mode 100644 PxShared/buildtools/packman/win-bootstrap/configure.bat delete mode 100644 PxShared/buildtools/packman/win-bootstrap/fetch_file_from_gtl.ps1 delete mode 100644 PxShared/buildtools/packman/win-bootstrap/fetch_file_from_s3.cmd delete mode 100644 PxShared/buildtools/packman/win-bootstrap/fetch_file_from_s3.ps1 delete mode 100644 PxShared/buildtools/packman/win-bootstrap/fetch_file_from_url.ps1 delete mode 100644 PxShared/buildtools/packman/win-bootstrap/generate_temp_file_name.ps1 delete mode 100644 PxShared/buildtools/packman/win-bootstrap/install_package.py delete mode 100644 PxShared/buildtools/steps/build_all_linux.sh delete mode 100644 PxShared/buildtools/steps/build_all_mac.sh delete mode 100644 PxShared/buildtools/steps/build_all_windows.bat delete mode 100644 PxShared/buildtools/steps/build_all_windows_vc12.bat delete mode 100644 PxShared/buildtools/steps/build_all_windows_vc14.bat delete mode 100644 PxShared/buildtools/steps/package_all_linux.sh delete mode 100644 PxShared/buildtools/steps/package_all_mac.sh delete mode 100644 PxShared/buildtools/steps/package_all_ps4.bat delete mode 100644 PxShared/buildtools/steps/package_all_windows.bat delete mode 100644 PxShared/buildtools/steps/package_all_xboxone.bat delete mode 100644 PxShared/buildtools/steps/pre-build_linux.sh delete mode 100644 PxShared/buildtools/steps/pre-build_mac.sh delete mode 100644 PxShared/buildtools/steps/pre-build_ps4.bat delete mode 100644 PxShared/buildtools/steps/pre-build_windows.bat delete mode 100644 PxShared/buildtools/steps/pre-build_xboxone.bat delete mode 100644 PxShared/buildtools/steps/rebuild_all_ps4.bat delete mode 100644 PxShared/buildtools/steps/rebuild_all_xboxone.bat delete mode 100644 PxShared/buildtools/steps/run_tests_linux.sh delete mode 100644 PxShared/buildtools/steps/run_tests_windows.bat delete mode 100644 PxShared/common.pm delete mode 100644 PxShared/dependencies.xml delete mode 100644 PxShared/generate_projects_android.bat delete mode 100644 PxShared/generate_projects_ios.sh delete mode 100644 PxShared/generate_projects_linux.bat delete mode 100644 PxShared/generate_projects_linux.sh delete mode 100644 PxShared/generate_projects_mac.sh delete mode 100644 PxShared/generate_projects_uwp.bat delete mode 100644 PxShared/generate_projects_win.bat delete mode 100644 PxShared/include/cudamanager/PxCudaContextManager.h delete mode 100644 PxShared/include/cudamanager/PxCudaMemoryManager.h delete mode 100644 PxShared/include/cudamanager/PxGpuCopyDesc.h delete mode 100644 PxShared/include/cudamanager/PxGpuCopyDescQueue.h delete mode 100644 PxShared/include/filebuf/PxFileBuf.h delete mode 100644 PxShared/include/foundation/PxAssert.h delete mode 100644 PxShared/include/foundation/PxFoundation.h delete mode 100644 PxShared/include/foundation/PxFoundationVersion.h delete mode 100644 PxShared/include/foundation/PxMathUtils.h create mode 100644 PxShared/include/foundation/PxSharedAssert.h delete mode 100644 PxShared/include/foundation/windows/PxWindowsFoundationDelayLoadHook.h delete mode 100644 PxShared/include/pvd/PxPvd.h delete mode 100644 PxShared/include/pvd/PxPvdTransport.h delete mode 100644 PxShared/include/pvd/windows/PxWindowsPvdDelayLoadHook.h delete mode 100644 PxShared/include/task/PxCpuDispatcher.h delete mode 100644 PxShared/include/task/PxGpuDispatcher.h delete mode 100644 PxShared/include/task/PxGpuTask.h delete mode 100644 PxShared/include/task/PxTask.h delete mode 100644 PxShared/include/task/PxTaskDefine.h delete mode 100644 PxShared/include/task/PxTaskManager.h delete mode 100644 PxShared/src/compiler/cmake/Android/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/Android/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/Android/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/Android/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/Android/PxTask.cmake delete mode 100644 PxShared/src/compiler/cmake/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/IOS/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/IOS/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/IOS/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/IOS/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/IOS/PxTask.cmake delete mode 100644 PxShared/src/compiler/cmake/Linux/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/Linux/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/Linux/PxCudaContextManager.cmake delete mode 100644 PxShared/src/compiler/cmake/Linux/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/Linux/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/Linux/PxTask.cmake delete mode 100644 PxShared/src/compiler/cmake/Mac/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/Mac/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/Mac/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/Mac/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/Mac/PxTask.cmake delete mode 100644 PxShared/src/compiler/cmake/Modules/FindPxShared.cmake delete mode 100644 PxShared/src/compiler/cmake/Modules/FindnvToolsExt.cmake delete mode 100644 PxShared/src/compiler/cmake/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/RegenProjects.bat delete mode 100644 PxShared/src/compiler/cmake/common/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/common/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/common/PxCudaContextManager.cmake delete mode 100644 PxShared/src/compiler/cmake/common/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/common/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/common/PxTask.cmake delete mode 100644 PxShared/src/compiler/cmake/findfileswithspec.py delete mode 100644 PxShared/src/compiler/cmake/html5/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/html5/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/html5/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/html5/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/html5/PxTask.cmake delete mode 100644 PxShared/src/compiler/cmake/templates/ProjectVersion.cmake.in delete mode 100644 PxShared/src/compiler/cmake/uwp/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/uwp/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/windows/CMakeLists.txt delete mode 100644 PxShared/src/compiler/cmake/windows/PsFastXml.cmake delete mode 100644 PxShared/src/compiler/cmake/windows/PxCudaContextManager.cmake delete mode 100644 PxShared/src/compiler/cmake/windows/PxFoundation.cmake delete mode 100644 PxShared/src/compiler/cmake/windows/PxPvdSDK.cmake delete mode 100644 PxShared/src/compiler/cmake/windows/PxTask.cmake delete mode 100644 PxShared/src/compiler/linux32/Makefile delete mode 100644 PxShared/src/compiler/linux32/Makefile.PsFastXml.mk delete mode 100644 PxShared/src/compiler/linux32/Makefile.PxCudaContextManager.mk delete mode 100644 PxShared/src/compiler/linux32/Makefile.PxFoundation.mk delete mode 100644 PxShared/src/compiler/linux32/Makefile.PxPvdSDK.mk delete mode 100644 PxShared/src/compiler/linux32/Makefile.PxTask.mk delete mode 100644 PxShared/src/compiler/linux64/Makefile delete mode 100644 PxShared/src/compiler/linux64/Makefile.PsFastXml.mk delete mode 100644 PxShared/src/compiler/linux64/Makefile.PxCudaContextManager.mk delete mode 100644 PxShared/src/compiler/linux64/Makefile.PxFoundation.mk delete mode 100644 PxShared/src/compiler/linux64/Makefile.PxPvdSDK.mk delete mode 100644 PxShared/src/compiler/linux64/Makefile.PxTask.mk delete mode 100644 PxShared/src/compiler/resource_x64/PxFoundation.rc delete mode 100644 PxShared/src/compiler/resource_x64/PxPvdSDK.rc delete mode 100644 PxShared/src/compiler/resource_x64/resource.h delete mode 100644 PxShared/src/compiler/resource_x86/PxFoundation.rc delete mode 100644 PxShared/src/compiler/resource_x86/PxPvdSDK.rc delete mode 100644 PxShared/src/compiler/resource_x86/resource.h delete mode 100644 PxShared/src/cudamanager/include/CudaContextManager.h delete mode 100644 PxShared/src/cudamanager/include/CudaKernelWrangler.h delete mode 100644 PxShared/src/cudamanager/include/GpuDispatcher.h delete mode 100644 PxShared/src/cudamanager/include/PhysXDeviceSettings.h delete mode 100644 PxShared/src/cudamanager/src/BlockingWait.cpp delete mode 100644 PxShared/src/cudamanager/src/CUDA/UtilKernels.cu delete mode 100644 PxShared/src/cudamanager/src/CudaContextManager.cpp delete mode 100644 PxShared/src/cudamanager/src/CudaKernelWrangler.cpp delete mode 100644 PxShared/src/cudamanager/src/CudaMemoryManager.cpp delete mode 100644 PxShared/src/cudamanager/src/CudaMemoryManager.h delete mode 100644 PxShared/src/cudamanager/src/CudaNode3DLowLatencyInterface.h delete mode 100644 PxShared/src/cudamanager/src/GpuDispatcher.cpp delete mode 100644 PxShared/src/cudamanager/src/HeapManagerInterface.h delete mode 100644 PxShared/src/cudamanager/src/HeapManagerLinkedList.h delete mode 100644 PxShared/src/cudamanager/src/HeapManagerRef.cpp delete mode 100644 PxShared/src/cudamanager/src/HeapManagerRef.h delete mode 100644 PxShared/src/cudamanager/src/PhysXDevice.h delete mode 100644 PxShared/src/cudamanager/src/PhysXDeviceSettings.cpp delete mode 100644 PxShared/src/fastxml/include/PsFastXml.h delete mode 100644 PxShared/src/fastxml/src/PsFastXml.cpp delete mode 100644 PxShared/src/filebuf/include/PsAsciiConversion.h delete mode 100644 PxShared/src/filebuf/include/PsAsciiConversion.inl delete mode 100644 PxShared/src/filebuf/include/PsFileBuffer.h delete mode 100644 PxShared/src/filebuf/include/PsIOStream.h delete mode 100644 PxShared/src/filebuf/include/PsIOStream.inl delete mode 100644 PxShared/src/filebuf/include/PsMemoryBuffer.h delete mode 100644 PxShared/src/foundation/doc/PsFoundation.chm delete mode 100644 PxShared/src/foundation/doc/Readme.txt delete mode 100644 PxShared/src/foundation/doc/create_docs.cmd delete mode 100644 PxShared/src/foundation/doc/docs.doxyfile delete mode 100644 PxShared/src/foundation/externals/src/android/cpu-features.c delete mode 100644 PxShared/src/foundation/externals/src/android/cpu-features.h delete mode 100644 PxShared/src/foundation/include/Ps.h delete mode 100644 PxShared/src/foundation/include/PsAlignedMalloc.h delete mode 100644 PxShared/src/foundation/include/PsAlloca.h delete mode 100644 PxShared/src/foundation/include/PsAllocator.h delete mode 100644 PxShared/src/foundation/include/PsAoS.h delete mode 100644 PxShared/src/foundation/include/PsArray.h delete mode 100644 PxShared/src/foundation/include/PsAtomic.h delete mode 100644 PxShared/src/foundation/include/PsBasicTemplates.h delete mode 100644 PxShared/src/foundation/include/PsBitUtils.h delete mode 100644 PxShared/src/foundation/include/PsBroadcast.h delete mode 100644 PxShared/src/foundation/include/PsCpu.h delete mode 100644 PxShared/src/foundation/include/PsFPU.h delete mode 100644 PxShared/src/foundation/include/PsFoundation.h delete mode 100644 PxShared/src/foundation/include/PsHash.h delete mode 100644 PxShared/src/foundation/include/PsHashInternals.h delete mode 100644 PxShared/src/foundation/include/PsHashMap.h delete mode 100644 PxShared/src/foundation/include/PsHashSet.h delete mode 100644 PxShared/src/foundation/include/PsInlineAllocator.h delete mode 100644 PxShared/src/foundation/include/PsInlineAoS.h delete mode 100644 PxShared/src/foundation/include/PsInlineArray.h delete mode 100644 PxShared/src/foundation/include/PsIntrinsics.h delete mode 100644 PxShared/src/foundation/include/PsMathUtils.h delete mode 100644 PxShared/src/foundation/include/PsMutex.h delete mode 100644 PxShared/src/foundation/include/PsPool.h delete mode 100644 PxShared/src/foundation/include/PsSList.h delete mode 100644 PxShared/src/foundation/include/PsSocket.h delete mode 100644 PxShared/src/foundation/include/PsSort.h delete mode 100644 PxShared/src/foundation/include/PsSortInternals.h delete mode 100644 PxShared/src/foundation/include/PsString.h delete mode 100644 PxShared/src/foundation/include/PsSync.h delete mode 100644 PxShared/src/foundation/include/PsTempAllocator.h delete mode 100644 PxShared/src/foundation/include/PsThread.h delete mode 100644 PxShared/src/foundation/include/PsTime.h delete mode 100644 PxShared/src/foundation/include/PsUserAllocated.h delete mode 100644 PxShared/src/foundation/include/PsUtilities.h delete mode 100644 PxShared/src/foundation/include/PsVecMath.h delete mode 100644 PxShared/src/foundation/include/PsVecMathAoSScalar.h delete mode 100644 PxShared/src/foundation/include/PsVecMathAoSScalarInline.h delete mode 100644 PxShared/src/foundation/include/PsVecMathSSE.h delete mode 100644 PxShared/src/foundation/include/PsVecMathUtilities.h delete mode 100644 PxShared/src/foundation/include/PsVecQuat.h delete mode 100644 PxShared/src/foundation/include/PsVecTransform.h delete mode 100644 PxShared/src/foundation/include/unix/PsUnixAoS.h delete mode 100644 PxShared/src/foundation/include/unix/PsUnixFPU.h delete mode 100644 PxShared/src/foundation/include/unix/PsUnixInlineAoS.h delete mode 100644 PxShared/src/foundation/include/unix/PsUnixIntrinsics.h delete mode 100644 PxShared/src/foundation/include/unix/PsUnixTrigConstants.h delete mode 100644 PxShared/src/foundation/include/unix/neon/PsUnixNeonAoS.h delete mode 100644 PxShared/src/foundation/include/unix/neon/PsUnixNeonInlineAoS.h delete mode 100644 PxShared/src/foundation/include/unix/sse2/PsUnixSse2AoS.h delete mode 100644 PxShared/src/foundation/include/unix/sse2/PsUnixSse2InlineAoS.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsAoS.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsFPU.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsInclude.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsInlineAoS.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsIntrinsics.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsLoadLibrary.h delete mode 100644 PxShared/src/foundation/include/windows/PsWindowsTrigConstants.h delete mode 100644 PxShared/src/foundation/src/PsAllocator.cpp delete mode 100644 PxShared/src/foundation/src/PsAssert.cpp delete mode 100644 PxShared/src/foundation/src/PsFoundation.cpp delete mode 100644 PxShared/src/foundation/src/PsMathUtils.cpp delete mode 100644 PxShared/src/foundation/src/PsString.cpp delete mode 100644 PxShared/src/foundation/src/PsTempAllocator.cpp delete mode 100644 PxShared/src/foundation/src/PsUtilities.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixAtomic.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixCpu.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixFPU.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixMutex.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixPrintString.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixSList.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixSocket.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixSync.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixThread.cpp delete mode 100644 PxShared/src/foundation/src/unix/PsUnixTime.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsUWPThread.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsAtomic.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsCpu.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsFPU.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsMutex.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsPrintString.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsSList.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsSocket.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsSync.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsThread.cpp delete mode 100644 PxShared/src/foundation/src/windows/PsWindowsTime.cpp delete mode 100644 PxShared/src/pvd/include/PsPvd.h delete mode 100644 PxShared/src/pvd/include/PxProfileAllocatorWrapper.h delete mode 100644 PxShared/src/pvd/include/PxPvdClient.h delete mode 100644 PxShared/src/pvd/include/PxPvdDataStream.h delete mode 100644 PxShared/src/pvd/include/PxPvdDataStreamHelpers.h delete mode 100644 PxShared/src/pvd/include/PxPvdErrorCodes.h delete mode 100644 PxShared/src/pvd/include/PxPvdObjectModelBaseTypes.h delete mode 100644 PxShared/src/pvd/include/PxPvdRenderBuffer.h delete mode 100644 PxShared/src/pvd/include/PxPvdUserRenderer.h delete mode 100644 PxShared/src/pvd/src/PxProfileBase.h delete mode 100644 PxShared/src/pvd/src/PxProfileCompileTimeEventFilter.h delete mode 100644 PxShared/src/pvd/src/PxProfileContextProvider.h delete mode 100644 PxShared/src/pvd/src/PxProfileContextProviderImpl.h delete mode 100644 PxShared/src/pvd/src/PxProfileDataBuffer.h delete mode 100644 PxShared/src/pvd/src/PxProfileDataParsing.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventBuffer.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventBufferAtomic.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventBufferClient.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventBufferClientManager.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventFilter.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventHandler.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventId.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventImpl.cpp delete mode 100644 PxShared/src/pvd/src/PxProfileEventMutex.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventNames.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventParser.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventSender.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventSerialization.h delete mode 100644 PxShared/src/pvd/src/PxProfileEventSystem.h delete mode 100644 PxShared/src/pvd/src/PxProfileEvents.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemory.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryBuffer.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEventBuffer.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEventParser.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEventRecorder.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEventReflexiveWriter.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEventSummarizer.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEventTypes.h delete mode 100644 PxShared/src/pvd/src/PxProfileMemoryEvents.h delete mode 100644 PxShared/src/pvd/src/PxProfileScopedEvent.h delete mode 100644 PxShared/src/pvd/src/PxProfileScopedMutexLock.h delete mode 100644 PxShared/src/pvd/src/PxProfileZone.h delete mode 100644 PxShared/src/pvd/src/PxProfileZoneImpl.h delete mode 100644 PxShared/src/pvd/src/PxProfileZoneManager.h delete mode 100644 PxShared/src/pvd/src/PxProfileZoneManagerImpl.h delete mode 100644 PxShared/src/pvd/src/PxPvd.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdBits.h delete mode 100644 PxShared/src/pvd/src/PxPvdByteStreams.h delete mode 100644 PxShared/src/pvd/src/PxPvdCommStreamEventSink.h delete mode 100644 PxShared/src/pvd/src/PxPvdCommStreamEvents.h delete mode 100644 PxShared/src/pvd/src/PxPvdCommStreamSDKEventTypes.h delete mode 100644 PxShared/src/pvd/src/PxPvdCommStreamTypes.h delete mode 100644 PxShared/src/pvd/src/PxPvdDataStream.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdDefaultFileTransport.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdDefaultFileTransport.h delete mode 100644 PxShared/src/pvd/src/PxPvdDefaultSocketTransport.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdDefaultSocketTransport.h delete mode 100644 PxShared/src/pvd/src/PxPvdFoundation.h delete mode 100644 PxShared/src/pvd/src/PxPvdImpl.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdImpl.h delete mode 100644 PxShared/src/pvd/src/PxPvdInternalByteStreams.h delete mode 100644 PxShared/src/pvd/src/PxPvdMarshalling.h delete mode 100644 PxShared/src/pvd/src/PxPvdMemClient.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdMemClient.h delete mode 100644 PxShared/src/pvd/src/PxPvdObjectModel.h delete mode 100644 PxShared/src/pvd/src/PxPvdObjectModelInternalTypeDefs.h delete mode 100644 PxShared/src/pvd/src/PxPvdObjectModelInternalTypes.h delete mode 100644 PxShared/src/pvd/src/PxPvdObjectModelMetaData.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdObjectModelMetaData.h delete mode 100644 PxShared/src/pvd/src/PxPvdObjectRegistrar.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdObjectRegistrar.h delete mode 100644 PxShared/src/pvd/src/PxPvdProfileZoneClient.cpp delete mode 100644 PxShared/src/pvd/src/PxPvdProfileZoneClient.h delete mode 100644 PxShared/src/pvd/src/PxPvdUserRenderImpl.h delete mode 100644 PxShared/src/pvd/src/PxPvdUserRenderTypes.h delete mode 100644 PxShared/src/pvd/src/PxPvdUserRenderer.cpp delete mode 100644 PxShared/src/pvd/src/windows/PxWindowsPvdDelayLoadHook.cpp delete mode 100644 PxShared/src/task/src/TaskManager.cpp diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 16e2563..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.txt text eol=crlf -*.bat text eol=crlf diff --git a/Externals/CMakeModules/Android/AndroidCMake.tps b/Externals/CMakeModules/Android/AndroidCMake.tps deleted file mode 100644 index 6ca944a..0000000 --- a/Externals/CMakeModules/Android/AndroidCMake.tps +++ /dev/null @@ -1,17 +0,0 @@ - - - - /Engine/Source/Runtime/Navmesh/RecastDemo/Bin/DroidSans.ttf - - - - - - - false - false - -Redirect: ../../../../HarfBuzz/harfbuzz-1.2.4/BuildForUE/Android/AndroidCMake.tps - - - \ No newline at end of file diff --git a/Externals/CMakeModules/Android/AndroidNdkGdb.cmake b/Externals/CMakeModules/Android/AndroidNdkGdb.cmake deleted file mode 100644 index 0677dcd..0000000 --- a/Externals/CMakeModules/Android/AndroidNdkGdb.cmake +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright (c) 2014, Pavel Rojtberg -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# ------------------------------------------------------------------------------ -# Usage: -# 1. place AndroidNdkGdb.cmake somewhere inside ${CMAKE_MODULE_PATH} -# 2. inside your project add -# -# include(AndroidNdkGdb) -# android_ndk_gdb_enable() -# # for each target -# add_library(MyLibrary ...) -# android_ndk_gdb_debuggable(MyLibrary) - - -# add gdbserver and general gdb configuration to project -# also create a mininal NDK skeleton so ndk-gdb finds the paths -# -# the optional parameter defines the path to the android project. -# uses PROJECT_SOURCE_DIR by default. -macro(android_ndk_gdb_enable) - if(ANDROID) - # create custom target that depends on the real target so it gets executed afterwards - add_custom_target(NDK_GDB ALL) - - if(${ARGC}) - set(ANDROID_PROJECT_DIR ${ARGV0}) - else() - set(ANDROID_PROJECT_DIR ${PROJECT_SOURCE_DIR}) - endif() - - set(NDK_GDB_SOLIB_PATH ${ANDROID_PROJECT_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}/) - file(MAKE_DIRECTORY ${NDK_GDB_SOLIB_PATH}) - - # 1. generate essential Android Makefiles - file(MAKE_DIRECTORY ${ANDROID_PROJECT_DIR}/jni) - if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Android.mk) - file(WRITE ${ANDROID_PROJECT_DIR}/jni/Android.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n") - endif() - if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Application.mk) - file(WRITE ${ANDROID_PROJECT_DIR}/jni/Application.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n") - endif() - - # 2. generate gdb.setup - get_directory_property(PROJECT_INCLUDES DIRECTORY ${PROJECT_SOURCE_DIR} INCLUDE_DIRECTORIES) - string(REGEX REPLACE ";" " " PROJECT_INCLUDES "${PROJECT_INCLUDES}") - file(WRITE ${LIBRARY_OUTPUT_PATH}/gdb.setup "set solib-search-path ${NDK_GDB_SOLIB_PATH}\n") - file(APPEND ${LIBRARY_OUTPUT_PATH}/gdb.setup "directory ${PROJECT_INCLUDES}\n") - - # 3. copy gdbserver executable - file(COPY ${ANDROID_NDK}/prebuilt/android-${ANDROID_ARCH_NAME}/gdbserver/gdbserver DESTINATION ${LIBRARY_OUTPUT_PATH}) - endif() -endmacro() - -# register a target for remote debugging -# copies the debug version to NDK_GDB_SOLIB_PATH then strips symbols of original -macro(android_ndk_gdb_debuggable TARGET_NAME) - if(ANDROID) - get_property(TARGET_LOCATION TARGET ${TARGET_NAME} PROPERTY LOCATION) - - # create custom target that depends on the real target so it gets executed afterwards - add_dependencies(NDK_GDB ${TARGET_NAME}) - - # 4. copy lib to obj - add_custom_command(TARGET NDK_GDB POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TARGET_LOCATION} ${NDK_GDB_SOLIB_PATH}) - - # 5. strip symbols - add_custom_command(TARGET NDK_GDB POST_BUILD COMMAND ${CMAKE_STRIP} ${TARGET_LOCATION}) - endif() -endmacro() diff --git a/Externals/CMakeModules/Android/AndroidNdkModules.cmake b/Externals/CMakeModules/Android/AndroidNdkModules.cmake deleted file mode 100644 index 64f37fd..0000000 --- a/Externals/CMakeModules/Android/AndroidNdkModules.cmake +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2014, Pavel Rojtberg -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -macro(android_ndk_import_module_cpufeatures) - if(ANDROID) - include_directories(${ANDROID_NDK}/sources/android/cpufeatures) - add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c) - target_link_libraries(cpufeatures dl) - endif() -endmacro() - -macro(android_ndk_import_module_native_app_glue) - if(ANDROID) - include_directories(${ANDROID_NDK}/sources/android/native_app_glue) - add_library(native_app_glue ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c) - target_link_libraries(native_app_glue log) - endif() -endmacro() - -macro(android_ndk_import_module_ndk_helper) - if(ANDROID) - android_ndk_import_module_cpufeatures() - android_ndk_import_module_native_app_glue() - - include_directories(${ANDROID_NDK}/sources/android/ndk_helper) - file(GLOB _NDK_HELPER_SRCS ${ANDROID_NDK}/sources/android/ndk_helper/*.cpp ${ANDROID_NDK}/sources/android/ndk_helper/gl3stub.c) - add_library(ndk_helper ${_NDK_HELPER_SRCS}) - target_link_libraries(ndk_helper log android EGL GLESv2 cpufeatures native_app_glue) - - unset(_NDK_HELPER_SRCS) - endif() -endmacro() \ No newline at end of file diff --git a/Externals/CMakeModules/Android/README.md b/Externals/CMakeModules/Android/README.md deleted file mode 100644 index ee63021..0000000 --- a/Externals/CMakeModules/Android/README.md +++ /dev/null @@ -1,240 +0,0 @@ -# android-cmake - -CMake is great, and so is Android. This is a collection of CMake scripts that may be useful to the Android NDK community. It is based on experience from porting OpenCV library to Android: http://opencv.org/platforms/android.html - -Main goal is to share these scripts so that devs that use CMake as their build system may easily compile native code for Android. - -## TL;DR - - cmake -DCMAKE_TOOLCHAIN_FILE=android.toolchain.cmake \ - -DANDROID_NDK= \ - -DCMAKE_BUILD_TYPE=Release \ - -DANDROID_ABI="armeabi-v7a with NEON" \ - - cmake --build . - -One-liner: - - cmake -DCMAKE_TOOLCHAIN_FILE=android.toolchain.cmake -DANDROID_NDK= -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="armeabi-v7a with NEON" && cmake --build . - -_android-cmake_ will search for your NDK install in the following order: - -1. Value of `ANDROID_NDK` CMake variable; -1. Value of `ANDROID_NDK` environment variable; -1. Search under paths from `ANDROID_NDK_SEARCH_PATHS` CMake variable; -1. Search platform specific locations (home folder, Windows "Program Files", etc). - -So if you have installed the NDK as `~/android-ndk-r10d` then _android-cmake_ will locate it automatically. - -## Getting started - -To build a cmake-based C/C++ project for Android you need: - -* Android NDK (>= r5) http://developer.android.com/tools/sdk/ndk/index.html -* CMake (>= v2.6.3, >= v2.8.9 recommended) http://www.cmake.org/download - -The _android-cmake_ is also capable to build with NDK from AOSP or Linaro Android source tree, but you may be required to manually specify path to `libm` binary to link with. - -## Difference from traditional CMake - -Folowing the _ndk-build_ the _android-cmake_ supports **only two build targets**: - -* `-DCMAKE_BUILD_TYPE=Release` -* `-DCMAKE_BUILD_TYPE=Debug` - -So don't even try other targets that can be found in CMake documentation and don't forget to explicitly specify `Release` or `Debug` because CMake builds without a build configuration by default. - -## Difference from _ndk-build_ - -* Latest GCC available in NDK is used as the default compiler; -* `Release` builds with `-O3` instead of `-Os`; -* `Release` builds without debug info (without `-g`) (because _ndk-build_ always creates a stripped version but cmake delays this for `install/strip` target); -* `-fsigned-char` is added to compiler flags to make `char` signed by default as it is on x86/x86_64; -* GCC's stack protector is not used neither in `Debug` nor `Release` configurations; -* No builds for multiple platforms (e.g. building for both arm and x86 require to run cmake twice with different parameters); -* No file level Neon via `.neon` suffix; - -The following features of _ndk-build_ are not supported by the _android-cmake_ yet: - -* `armeabi-v7a-hard` ABI -* `libc++_static`/`libc++_shared` STL runtime - -## Basic options - -Similarly to the NDK build system _android-cmake_ allows to select between several compiler toolchains and target platforms. Most of the options can be set either as cmake arguments: `-D=` or as environment variables: - -* **ANDROID_NDK** - path to the Android NDK. If not set then _android-cmake_ will search for the most recent version of supported NDK in commonly used locations; -* **ANDROID_ABI** - specifies the target Application Binary Interface (ABI). This option nearly matches to the APP_ABI variable used by ndk-build tool from Android NDK. If not specified then set to `armeabi-v7a`. Possible target names are: - * `armeabi` - ARMv5TE based CPU with software floating point operations; - * **`armeabi-v7a`** - ARMv7 based devices with hardware FPU instructions (VFPv3_D16); - * `armeabi-v7a with NEON` - same as armeabi-v7a, but sets NEON as floating-point unit; - * `armeabi-v7a with VFPV3` - same as armeabi-v7a, but sets VFPv3_D32 as floating-point unit; - * `armeabi-v6 with VFP` - tuned for ARMv6 processors having VFP; - * `x86` - IA-32 instruction set - * `mips` - MIPS32 instruction set - * `arm64-v8a` - ARMv8 AArch64 instruction set - only for NDK r10 and newer - * `x86_64` - Intel64 instruction set (r1) - only for NDK r10 and newer - * `mips64` - MIPS64 instruction set (r6) - only for NDK r10 and newer -* **ANDROID_NATIVE_API_LEVEL** - level of android API to build for. Can be set either to full name (example: `android-8`) or a numeric value (example: `17`). The default API level depends on the target ABI: - * `android-8` for ARM; - * `android-9` for x86 and MIPS; - * `android-21` for 64-bit ABIs. - - Building for `android-L` is possible only when it is explicitly selected. -* **ANDROID_TOOLCHAIN_NAME** - the name of compiler toolchain to be used. This option allows to select between different GCC and Clang versions. The list of possible values depends on the NDK version and will be printed by toolchain file if an invalid value is set. By default _android-cmake_ selects the most recent version of GCC which can build for specified `ANDROID_ABI`. - - Example values are: - * `aarch64-linux-android-4.9` - * `aarch64-linux-android-clang3.5` - * `arm-linux-androideabi-4.8` - * `arm-linux-androideabi-4.9` - * `arm-linux-androideabi-clang3.5` - * `mips64el-linux-android-4.9` - * `mipsel-linux-android-4.8` - * `x86-4.9` - * `x86_64-4.9` - * etc. -* **ANDROID_STL** - the name of C++ runtime to use. The default is `gnustl_static`. - * `none` - do not configure the runtime. - * `system` - use the default minimal system C++ runtime library. - * Implies `-fno-rtti -fno-exceptions`. - * `system_re` - use the default minimal system C++ runtime library. - * Implies `-frtti -fexceptions`. - * `gabi++_static` - use the GAbi++ runtime as a static library. - * Implies `-frtti -fno-exceptions`. - * Available for NDK r7 and newer. - * `gabi++_shared` - use the GAbi++ runtime as a shared library. - * Implies `-frtti -fno-exceptions`. - * Available for NDK r7 and newer. - * `stlport_static` - use the STLport runtime as a static library. - * Implies `-fno-rtti -fno-exceptions` for NDK before r7. - * Implies `-frtti -fno-exceptions` for NDK r7 and newer. - * `stlport_shared` - use the STLport runtime as a shared library. - * Implies `-fno-rtti -fno-exceptions` for NDK before r7. - * Implies `-frtti -fno-exceptions` for NDK r7 and newer. - * **`gnustl_static`** - use the GNU STL as a static library. - * Implies `-frtti -fexceptions`. - * `gnustl_shared` - use the GNU STL as a shared library. - * Implies `-frtti -fno-exceptions`. - * Available for NDK r7b and newer. - * Silently degrades to `gnustl_static` if not available. -* **NDK_CCACHE** - path to `ccache` executable. If not set then initialized from `NDK_CCACHE` environment variable. - -## Advanced _android-cmake_ options - -Normally _android-cmake_ users are not supposed to touch these variables but they might be useful to workaround some build issues: - -* **ANDROID_FORCE_ARM_BUILD** = `OFF` - generate 32-bit ARM instructions instead of Thumb. Applicable only for arm ABIs and is forced to be `ON` for `armeabi-v6 with VFP`; -* **ANDROID_NO_UNDEFINED** = `ON` - show all undefined symbols as linker errors; -* **ANDROID_SO_UNDEFINED** = `OFF` - allow undefined symbols in shared libraries; - * actually it is turned `ON` by default for NDK older than `r7` -* **ANDROID_STL_FORCE_FEATURES** = `ON` - automatically configure rtti and exceptions support based on C++ runtime; -* **ANDROID_NDK_LAYOUT** = `RELEASE` - inner layout of Android NDK, should be detected automatically. Possible values are: - * `RELEASE` - public releases from Google; - * `LINARO` - NDK from Linaro project; - * `ANDROID` - NDK from AOSP. -* **ANDROID_FUNCTION_LEVEL_LINKING** = `ON` - enables saparate putting each function and data items into separate sections and enable garbage collection of unused input sections at link time (`-fdata-sections -ffunction-sections -Wl,--gc-sections`); -* **ANDROID_GOLD_LINKER** = `ON` - use gold linker with GCC 4.6 for NDK r8b and newer (only for ARM and x86); -* **ANDROID_NOEXECSTACK** = `ON` - enables or disables stack execution protection code (`-Wl,-z,noexecstack`); -* **ANDROID_RELRO** = `ON` - Enables RELRO - a memory corruption mitigation technique (`-Wl,-z,relro -Wl,-z,now`); -* **ANDROID_LIBM_PATH** - path to `libm.so` (set to something like `$(TOP)/out/target/product//obj/lib/libm.so`) to workaround unresolved `sincos`. - -## Fine-tuning `CMakeLists.txt` for _android-cmake_ - -### Recognizing Android build - -_android-cmake_ defines `ANDROID` CMake variable which can be used to add Android-specific stuff: - - if (ANDROID) - message(STATUS "Hello from Android build!") - endif() - -The recommended way to identify ARM/MIPS/x86 architecture is examining `CMAKE_SYSTEM_PROCESSOR` which is set to the appropriate value: - -* `armv5te` - for `armeabi` ABI -* `armv6` - for `armeabi-v6 with VFP` ABI -* `armv7-a` - for `armeabi-v7a`, `armeabi-v7a with VFPV3` and `armeabi-v7a with NEON` ABIs -* `aarch64` - for `arm64-v8a` ABI -* `i686` - for `x86` ABI -* `x86_64` - for `x86_64` ABI -* `mips` - for `mips` ABI -* `mips64` - for `mips64` ABI - -Other variables that are set by _android-cmake_ and can be used for the fine-grained build configuration are: - -* `NEON` - set if target ABI supports Neon; -* `ANDROID_NATIVE_API_LEVEL` - native Android API level we are building for (note: Java part of Andoid application can be built for another API level) -* `ANDROID_NDK_RELEASE` - version of the Android NDK -* `ANDROID_NDK_HOST_SYSTEM_NAME` - "windows", "linux-x86" or "darwin-x86" depending on the host platform -* `ANDROID_RTTI` - set if rtti is enabled by the runtime -* `ANDROID_EXCEPTIONS` - set if exceptions are enabled by the runtime - -### Finding packages - -When crosscompiling CMake `find_*` commands are normally expected to find libraries and packages belonging to the same build target. So _android-cmake_ configures CMake to search in Android-specific paths only and ignore your host system locations. So - - find_package(ZLIB) - -will surely find libz.so within the Android NDK. - -However sometimes you need to locate a host package even when cross-compiling. For example you can be searching for your documentation generator. The _android-cmake_ recommends you to use `find_host_package` and `find_host_program` macro defined in the `android.toolchain.cmake`: - - find_host_package(Doxygen) - find_host_program(PDFLATEX pdflatex) - -However this will break regular builds so instead of wrapping package search into platform-specific logic you can copy the following snippet into your project (put it after your top-level `project()` command): - - # Search packages for host system instead of packages for target system - # in case of cross compilation these macro should be defined by toolchain file - if(NOT COMMAND find_host_package) - macro(find_host_package) - find_package(${ARGN}) - endmacro() - endif() - if(NOT COMMAND find_host_program) - macro(find_host_program) - find_program(${ARGN}) - endmacro() - endif() - -### Compiler flags recycling - -Make sure to do the following in your scripts: - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}") - -The flags will be prepopulated with critical flags, so don't loose them. Also be aware that _android-cmake_ also sets configuration-specific compiler and linker flags. - -## Troubleshooting - -### Building on Windows - -First of all `cygwin` builds are **NOT supported** and will not be supported by _android-cmake_. To build natively on Windows you need a port of make but I recommend http://martine.github.io/ninja/ instead. - -To build with Ninja you need: - -* Ensure you are using CMake newer than 2.8.9; -* Download the latest Ninja from https://github.com/martine/ninja/releases; -* Put the `ninja.exe` into your PATH (or add path to `ninja.exe` to your PATH environment variable); -* Pass `-GNinja` to `cmake` alongside with other arguments (or choose Ninja generator in `cmake-gui`). -* Enjoy the fast native multithreaded build :) - -But if you still want to stick to old make then: - -* Get a Windows port of GNU Make: - * Android NDK r7 (and newer) already has `make.exe` on board; - * `mingw-make` should work as fine; - * Download some other port. For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm. -* Add path to your `make.exe` to system PATH or always use full path; -* Pass `-G"MinGW Makefiles"` and `-DCMAKE_MAKE_PROGRAM="make.exe"` - * It must be `MinGW Makefiles` and not `Unix Makefiles` even if your `make.exe` is not a MinGW's make. -* Run `make.exe` or `cmake --build .` for single-threaded build. - -### Projects with assembler files - -The _android-cmake_ should correctly handle projects with assembler sources (`*.s` or `*.S`). But if you still facing problems with assembler then try to upgrade your CMake to version newer than 2.8.5 - -## Copying - -_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) \ No newline at end of file diff --git a/Externals/CMakeModules/Android/android.toolchain.cmake b/Externals/CMakeModules/Android/android.toolchain.cmake deleted file mode 100644 index 7fc54f2..0000000 --- a/Externals/CMakeModules/Android/android.toolchain.cmake +++ /dev/null @@ -1,1693 +0,0 @@ -# Copyright (c) 2010-2011, Ethan Rublee -# Copyright (c) 2011-2014, Andrey Kamaev -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# ------------------------------------------------------------------------------ -# Android CMake toolchain file, for use with the Android NDK r5-r10d -# Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended). -# See home page: https://github.com/taka-no-me/android-cmake -# -# Usage Linux: -# $ export ANDROID_NDK=/absolute/path/to/the/android-ndk -# $ mkdir build && cd build -# $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake .. -# $ make -j8 -# -# Usage Windows: -# You need native port of make to build your project. -# Android NDK r7 (and newer) already has make.exe on board. -# For older NDK you have to install it separately. -# For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm -# -# $ SET ANDROID_NDK=C:\absolute\path\to\the\android-ndk -# $ mkdir build && cd build -# $ cmake.exe -G"MinGW Makefiles" -# -DCMAKE_TOOLCHAIN_FILE=path\to\the\android.toolchain.cmake -# -DCMAKE_MAKE_PROGRAM="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" .. -# $ cmake.exe --build . -# -# -# Options (can be set as cmake parameters: -D=): -# ANDROID_NDK=/opt/android-ndk - path to the NDK root. -# Can be set as environment variable. Can be set only at first cmake run. -# -# ANDROID_ABI=armeabi-v7a - specifies the target Application Binary -# Interface (ABI). This option nearly matches to the APP_ABI variable -# used by ndk-build tool from Android NDK. -# -# Possible targets are: -# "armeabi" - ARMv5TE based CPU with software floating point operations -# "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions -# this ABI target is used by default -# "armeabi-v7a with NEON" - same as armeabi-v7a, but -# sets NEON as floating-point unit -# "armeabi-v7a with VFPV3" - same as armeabi-v7a, but -# sets VFPV3 as floating-point unit (has 32 registers instead of 16) -# "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP -# "x86" - IA-32 instruction set -# "mips" - MIPS32 instruction set -# -# 64-bit ABIs for NDK r10 and newer: -# "arm64-v8a" - ARMv8 AArch64 instruction set -# "x86_64" - Intel64 instruction set (r1) -# "mips64" - MIPS64 instruction set (r6) -# -# ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for. -# Option is read-only when standalone toolchain is used. -# Note: building for "android-L" requires explicit configuration. -# -# ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 - the name of compiler -# toolchain to be used. The list of possible values depends on the NDK -# version. For NDK r10c the possible values are: -# -# * aarch64-linux-android-4.9 -# * aarch64-linux-android-clang3.4 -# * aarch64-linux-android-clang3.5 -# * arm-linux-androideabi-4.6 -# * arm-linux-androideabi-4.8 -# * arm-linux-androideabi-4.9 (default) -# * arm-linux-androideabi-clang3.4 -# * arm-linux-androideabi-clang3.5 -# * mips64el-linux-android-4.9 -# * mips64el-linux-android-clang3.4 -# * mips64el-linux-android-clang3.5 -# * mipsel-linux-android-4.6 -# * mipsel-linux-android-4.8 -# * mipsel-linux-android-4.9 -# * mipsel-linux-android-clang3.4 -# * mipsel-linux-android-clang3.5 -# * x86-4.6 -# * x86-4.8 -# * x86-4.9 -# * x86-clang3.4 -# * x86-clang3.5 -# * x86_64-4.9 -# * x86_64-clang3.4 -# * x86_64-clang3.5 -# -# ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions -# instead of Thumb. Is not available for "armeabi-v6 with VFP" -# (is forced to be ON) ABI. -# -# ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker -# errors even if they are not used. -# -# ANDROID_SO_UNDEFINED=OFF - set ON to allow undefined symbols in shared -# libraries. Automatically turned for NDK r5x and r6x due to GLESv2 -# problems. -# -# ANDROID_STL=gnustl_static - specify the runtime to use. -# -# Possible values are: -# none -> Do not configure the runtime. -# system -> Use the default minimal system C++ runtime library. -# Implies -fno-rtti -fno-exceptions. -# Is not available for standalone toolchain. -# system_re -> Use the default minimal system C++ runtime library. -# Implies -frtti -fexceptions. -# Is not available for standalone toolchain. -# gabi++_static -> Use the GAbi++ runtime as a static library. -# Implies -frtti -fno-exceptions. -# Available for NDK r7 and newer. -# Is not available for standalone toolchain. -# gabi++_shared -> Use the GAbi++ runtime as a shared library. -# Implies -frtti -fno-exceptions. -# Available for NDK r7 and newer. -# Is not available for standalone toolchain. -# stlport_static -> Use the STLport runtime as a static library. -# Implies -fno-rtti -fno-exceptions for NDK before r7. -# Implies -frtti -fno-exceptions for NDK r7 and newer. -# Is not available for standalone toolchain. -# stlport_shared -> Use the STLport runtime as a shared library. -# Implies -fno-rtti -fno-exceptions for NDK before r7. -# Implies -frtti -fno-exceptions for NDK r7 and newer. -# Is not available for standalone toolchain. -# gnustl_static -> Use the GNU STL as a static library. -# Implies -frtti -fexceptions. -# gnustl_shared -> Use the GNU STL as a shared library. -# Implies -frtti -fno-exceptions. -# Available for NDK r7b and newer. -# Silently degrades to gnustl_static if not available. -# -# ANDROID_STL_FORCE_FEATURES=ON - turn rtti and exceptions support based on -# chosen runtime. If disabled, then the user is responsible for settings -# these options. -# -# What?: -# android-cmake toolchain searches for NDK/toolchain in the following order: -# ANDROID_NDK - cmake parameter -# ANDROID_NDK - environment variable -# ANDROID_STANDALONE_TOOLCHAIN - cmake parameter -# ANDROID_STANDALONE_TOOLCHAIN - environment variable -# ANDROID_NDK - default locations -# ANDROID_STANDALONE_TOOLCHAIN - default locations -# -# Make sure to do the following in your scripts: -# SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}" ) -# SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}" ) -# The flags will be prepopulated with critical flags, so don't loose them. -# Also be aware that toolchain also sets configuration-specific compiler -# flags and linker flags. -# -# ANDROID and BUILD_ANDROID will be set to true, you may test any of these -# variables to make necessary Android-specific configuration changes. -# -# Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64 -# will be set true, mutually exclusive. NEON option will be set true -# if VFP is set to NEON. -# -# ------------------------------------------------------------------------------ - -cmake_minimum_required( VERSION 2.6.3 ) - -if( DEFINED CMAKE_CROSSCOMPILING ) - # subsequent toolchain loading is not really needed - return() -endif() - -if( CMAKE_TOOLCHAIN_FILE ) - # touch toolchain variable to suppress "unused variable" warning -endif() - -# inherit settings in recursive loads -get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) -if( _CMAKE_IN_TRY_COMPILE ) - include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL ) -endif() - -# this one is important -if( CMAKE_VERSION VERSION_GREATER "3.0.99" ) - set( CMAKE_SYSTEM_NAME Android ) -else() - set( CMAKE_SYSTEM_NAME Linux ) -endif() - -# this one not so much -set( CMAKE_SYSTEM_VERSION 1 ) - -# rpath makes low sense for Android -set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" ) -set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) - -# NDK search paths -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r11c -r11b -r11a -r10e -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) -if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS ) - if( CMAKE_HOST_WIN32 ) - file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) - set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}" "$ENV{SystemDrive}/NVPACK" ) - else() - file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS ) - set( ANDROID_NDK_SEARCH_PATHS /opt "${ANDROID_NDK_SEARCH_PATHS}/NVPACK" ) - endif() -endif() -if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) - set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain ) -endif() - -# known ABIs -set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) -set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" ) -set( ANDROID_SUPPORTED_ABIS_x86 "x86" ) -set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" ) -set( ANDROID_SUPPORTED_ABIS_mips "mips" ) -set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) - -# API level defaults -set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_mips64 21 ) - - -macro( __LIST_FILTER listvar regex ) - if( ${listvar} ) - foreach( __val ${${listvar}} ) - if( __val MATCHES "${regex}" ) - list( REMOVE_ITEM ${listvar} "${__val}" ) - endif() - endforeach() - endif() -endmacro() - -macro( __INIT_VARIABLE var_name ) - set( __test_path 0 ) - foreach( __var ${ARGN} ) - if( __var STREQUAL "PATH" ) - set( __test_path 1 ) - break() - endif() - endforeach() - - if( __test_path AND NOT EXISTS "${${var_name}}" ) - unset( ${var_name} CACHE ) - endif() - - if( " ${${var_name}}" STREQUAL " " ) - set( __values 0 ) - foreach( __var ${ARGN} ) - if( __var STREQUAL "VALUES" ) - set( __values 1 ) - elseif( NOT __var STREQUAL "PATH" ) - if( __var MATCHES "^ENV_.*$" ) - string( REPLACE "ENV_" "" __var "${__var}" ) - set( __value "$ENV{${__var}}" ) - elseif( DEFINED ${__var} ) - set( __value "${${__var}}" ) - elseif( __values ) - set( __value "${__var}" ) - else() - set( __value "" ) - endif() - - if( NOT " ${__value}" STREQUAL " " AND (NOT __test_path OR EXISTS "${__value}") ) - set( ${var_name} "${__value}" ) - break() - endif() - endif() - endforeach() - unset( __value ) - unset( __values ) - endif() - - if( __test_path ) - file( TO_CMAKE_PATH "${${var_name}}" ${var_name} ) - endif() - unset( __test_path ) -endmacro() - -macro( __DETECT_NATIVE_API_LEVEL _var _path ) - set( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*.*$" ) - file( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" ) - if( NOT __apiFileContent ) - message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." ) - endif() - string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" ) - unset( __apiFileContent ) - unset( __ndkApiLevelRegex ) -endmacro() - -macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root ) - if( EXISTS "${_root}" ) - file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" ) - __LIST_FILTER( __gccExePath "^[.].*" ) - list( LENGTH __gccExePath __gccExePathsCount ) - if( NOT __gccExePathsCount EQUAL 1 AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "Could not determine machine name for compiler from ${_root}" ) - set( ${_var} "" ) - else() - get_filename_component( __gccExeName "${__gccExePath}" NAME_WE ) - string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" ) - endif() - unset( __gccExePath ) - unset( __gccExePathsCount ) - unset( __gccExeName ) - else() - set( ${_var} "" ) - endif() -endmacro() - - -# fight against cygwin -set( ANDROID_FORBID_SYGWIN TRUE CACHE BOOL "Prevent cmake from working under cygwin and using cygwin tools") -mark_as_advanced( ANDROID_FORBID_SYGWIN ) -if( ANDROID_FORBID_SYGWIN ) - if( CYGWIN ) - message( FATAL_ERROR "Android NDK and android-cmake toolchain are not welcome Cygwin. It is unlikely that this cmake toolchain will work under cygwin. But if you want to try then you can set cmake variable ANDROID_FORBID_SYGWIN to FALSE and rerun cmake." ) - endif() - - if( CMAKE_HOST_WIN32 ) - # remove cygwin from PATH - set( __new_path "$ENV{PATH}") - __LIST_FILTER( __new_path "cygwin" ) - set(ENV{PATH} "${__new_path}") - unset(__new_path) - endif() -endif() - - -# detect current host platform -if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) ) - set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" ) - mark_as_advanced( ANDROID_NDK_HOST_X64 ) -endif() - -set( TOOL_OS_SUFFIX "" ) -if( CMAKE_HOST_APPLE ) - set( ANDROID_NDK_HOST_SYSTEM_NAME "darwin-x86_64" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME2 "darwin-x86" ) -elseif( CMAKE_HOST_WIN32 ) - set( ANDROID_NDK_HOST_SYSTEM_NAME "windows-x86_64" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME2 "windows" ) - set( TOOL_OS_SUFFIX ".exe" ) -elseif( CMAKE_HOST_UNIX ) - set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86_64" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME2 "linux-x86" ) -else() - message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" ) -endif() - -if( NOT ANDROID_NDK_HOST_X64 ) - set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) -endif() - -# see if we have path to Android NDK -if( NOT ANDROID_NDK AND NOT ANDROID_STANDALONE_TOOLCHAIN ) - __INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK ) -endif() -if( NOT ANDROID_NDK ) - # see if we have path to Android standalone toolchain - __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN ) - - if( NOT ANDROID_STANDALONE_TOOLCHAIN ) - #try to find Android NDK in one of the the default locations - set( __ndkSearchPaths ) - foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} ) - foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} ) - list( APPEND __ndkSearchPaths "${__ndkSearchPath}/android-ndk${suffix}" ) - endforeach() - endforeach() - __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} ) - unset( __ndkSearchPaths ) - - if( ANDROID_NDK ) - message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" ) - message( STATUS " If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" ) - else() - #try to find Android standalone toolchain in one of the the default locations - __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) - - if( ANDROID_STANDALONE_TOOLCHAIN ) - message( STATUS "Using default path for standalone toolchain ${ANDROID_STANDALONE_TOOLCHAIN}" ) - message( STATUS " If you prefer to use a different location, please define the variable: ANDROID_STANDALONE_TOOLCHAIN" ) - endif( ANDROID_STANDALONE_TOOLCHAIN ) - endif( ANDROID_NDK ) - endif( NOT ANDROID_STANDALONE_TOOLCHAIN ) -endif( NOT ANDROID_NDK ) - -# remember found paths -if( ANDROID_NDK ) - get_filename_component( ANDROID_NDK "${ANDROID_NDK}" ABSOLUTE ) - set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE ) - set( BUILD_WITH_ANDROID_NDK True ) - if( EXISTS "${ANDROID_NDK}/RELEASE.TXT" ) - file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX "r[0-9]+[a-z]?" ) - string( REGEX MATCH "r([0-9]+)([a-z]?)" ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" ) - else() - set( ANDROID_NDK_RELEASE "r1x" ) - set( ANDROID_NDK_RELEASE_FULL "unreleased" ) - endif() - string( REGEX REPLACE "r([0-9]+)([a-z]?)" "\\1*1000" ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE}" ) - string( FIND " abcdefghijklmnopqastuvwxyz" "${CMAKE_MATCH_2}" __ndkReleaseLetterNum ) - math( EXPR ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE_NUM}+${__ndkReleaseLetterNum}" ) -elseif( ANDROID_STANDALONE_TOOLCHAIN ) - get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE ) - # try to detect change - if( CMAKE_AR ) - string( LENGTH "${ANDROID_STANDALONE_TOOLCHAIN}" __length ) - string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidStandaloneToolchainPreviousPath ) - if( NOT __androidStandaloneToolchainPreviousPath STREQUAL ANDROID_STANDALONE_TOOLCHAIN ) - message( FATAL_ERROR "It is not possible to change path to the Android standalone toolchain on subsequent run." ) - endif() - unset( __androidStandaloneToolchainPreviousPath ) - unset( __length ) - endif() - set( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" CACHE INTERNAL "Path of the Android standalone toolchain" FORCE ) - set( BUILD_WITH_STANDALONE_TOOLCHAIN True ) -else() - list(GET ANDROID_NDK_SEARCH_PATHS 0 ANDROID_NDK_SEARCH_PATH) - message( FATAL_ERROR "Could not find neither Android NDK nor Android standalone toolchain. - You should either set an environment variable: - export ANDROID_NDK=~/my-android-ndk - or - export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain - or put the toolchain or NDK in the default path: - sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}/android-ndk - sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" ) -endif() - -# android NDK layout -if( BUILD_WITH_ANDROID_NDK ) - if( NOT DEFINED ANDROID_NDK_LAYOUT ) - # try to automatically detect the layout - if( EXISTS "${ANDROID_NDK}/RELEASE.TXT") - set( ANDROID_NDK_LAYOUT "RELEASE" ) - elseif( EXISTS "${ANDROID_NDK}/../../linux-x86/toolchain/" ) - set( ANDROID_NDK_LAYOUT "LINARO" ) - elseif( EXISTS "${ANDROID_NDK}/../../gcc/" ) - set( ANDROID_NDK_LAYOUT "ANDROID" ) - endif() - endif() - set( ANDROID_NDK_LAYOUT "${ANDROID_NDK_LAYOUT}" CACHE STRING "The inner layout of NDK" ) - mark_as_advanced( ANDROID_NDK_LAYOUT ) - if( ANDROID_NDK_LAYOUT STREQUAL "LINARO" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment - set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../${ANDROID_NDK_HOST_SYSTEM_NAME}/toolchain" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH "" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" ) - elseif( ANDROID_NDK_LAYOUT STREQUAL "ANDROID" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment - set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../gcc/${ANDROID_NDK_HOST_SYSTEM_NAME}/arm" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH "" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" ) - else() # ANDROID_NDK_LAYOUT STREQUAL "RELEASE" - set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/toolchains" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME2}" ) - endif() - get_filename_component( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK_TOOLCHAINS_PATH}" ABSOLUTE ) - - # try to detect change of NDK - if( CMAKE_AR ) - string( LENGTH "${ANDROID_NDK_TOOLCHAINS_PATH}" __length ) - string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath ) - if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK_TOOLCHAINS_PATH ) - message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first. - " ) - endif() - unset( __androidNdkPreviousPath ) - unset( __length ) - endif() -endif() - - -# get all the details about standalone toolchain -if( BUILD_WITH_STANDALONE_TOOLCHAIN ) - __DETECT_NATIVE_API_LEVEL( ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot/usr/include/android/api-level.h" ) - set( ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - set( __availableToolchains "standalone" ) - __DETECT_TOOLCHAIN_MACHINE_NAME( __availableToolchainMachines "${ANDROID_STANDALONE_TOOLCHAIN}" ) - if( NOT __availableToolchainMachines ) - message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." ) - endif() - if( __availableToolchainMachines MATCHES x86_64 ) - set( __availableToolchainArchs "x86_64" ) - elseif( __availableToolchainMachines MATCHES i686 ) - set( __availableToolchainArchs "x86" ) - elseif( __availableToolchainMachines MATCHES aarch64 ) - set( __availableToolchainArchs "arm64" ) - elseif( __availableToolchainMachines MATCHES arm ) - set( __availableToolchainArchs "arm" ) - elseif( __availableToolchainMachines MATCHES mips64el ) - set( __availableToolchainArchs "mips64" ) - elseif( __availableToolchainMachines MATCHES mipsel ) - set( __availableToolchainArchs "mips" ) - endif() - execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion - OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE ) - string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" ) - if( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/bin/clang${TOOL_OS_SUFFIX}" ) - list( APPEND __availableToolchains "standalone-clang" ) - list( APPEND __availableToolchainMachines ${__availableToolchainMachines} ) - list( APPEND __availableToolchainArchs ${__availableToolchainArchs} ) - list( APPEND __availableToolchainCompilerVersions ${__availableToolchainCompilerVersions} ) - endif() -endif() - -macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath ) - foreach( __toolchain ${${__availableToolchainsLst}} ) - if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" ) - SET( __toolchainVersionRegex "^TOOLCHAIN_VERSION[\t ]+:=[\t ]+(.*)$" ) - FILE( STRINGS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}/setup.mk" __toolchainVersionStr REGEX "${__toolchainVersionRegex}" ) - if( __toolchainVersionStr ) - string( REGEX REPLACE "${__toolchainVersionRegex}" "\\1" __toolchainVersionStr "${__toolchainVersionStr}" ) - string( REGEX REPLACE "-clang3[.][0-9]$" "-${__toolchainVersionStr}" __gcc_toolchain "${__toolchain}" ) - else() - string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) - endif() - unset( __toolchainVersionStr ) - unset( __toolchainVersionRegex ) - else() - set( __gcc_toolchain "${__toolchain}" ) - endif() - __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" ) - if( __machine ) - string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" ) - if( __machine MATCHES x86_64 ) - set( __arch "x86_64" ) - elseif( __machine MATCHES i686 ) - set( __arch "x86" ) - elseif( __machine MATCHES aarch64 ) - set( __arch "arm64" ) - elseif( __machine MATCHES arm ) - set( __arch "arm" ) - elseif( __machine MATCHES mips64el ) - set( __arch "mips64" ) - elseif( __machine MATCHES mipsel ) - set( __arch "mips" ) - else() - set( __arch "" ) - endif() - #message("machine: !${__machine}!\narch: !${__arch}!\nversion: !${__version}!\ntoolchain: !${__toolchain}!\n") - if (__arch) - list( APPEND __availableToolchainMachines "${__machine}" ) - list( APPEND __availableToolchainArchs "${__arch}" ) - list( APPEND __availableToolchainCompilerVersions "${__version}" ) - list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) - endif() - endif() - unset( __gcc_toolchain ) - endforeach() -endmacro() - -# get all the details about NDK -if( BUILD_WITH_ANDROID_NDK ) - file( GLOB ANDROID_SUPPORTED_NATIVE_API_LEVELS RELATIVE "${ANDROID_NDK}/platforms" "${ANDROID_NDK}/platforms/android-*" ) - string( REPLACE "android-" "" ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_SUPPORTED_NATIVE_API_LEVELS}" ) - set( __availableToolchains "" ) - set( __availableToolchainMachines "" ) - set( __availableToolchainArchs "" ) - set( __availableToolchainCompilerVersions "" ) - if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_TOOLCHAIN_NAME}/" ) - # do not go through all toolchains if we know the name - set( __availableToolchainsLst "${ANDROID_TOOLCHAIN_NAME}" ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) - if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) - if( __availableToolchains ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} ) - endif() - endif() - endif() - if( NOT __availableToolchains ) - file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" ) - if( __availableToolchainsLst ) - list(SORT __availableToolchainsLst) # we need clang to go after gcc - endif() - __LIST_FILTER( __availableToolchainsLst "^[.]" ) - __LIST_FILTER( __availableToolchainsLst "llvm" ) - __LIST_FILTER( __availableToolchainsLst "renderscript" ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) - if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) - if( __availableToolchains ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} ) - endif() - endif() - endif() - if( NOT __availableToolchains ) - message( FATAL_ERROR "Could not find any working toolchain in the NDK. Probably your Android NDK is broken." ) - endif() -endif() - -# build list of available ABIs -set( ANDROID_SUPPORTED_ABIS "" ) -set( __uniqToolchainArchNames ${__availableToolchainArchs} ) -list( REMOVE_DUPLICATES __uniqToolchainArchNames ) -list( SORT __uniqToolchainArchNames ) -foreach( __arch ${__uniqToolchainArchNames} ) - list( APPEND ANDROID_SUPPORTED_ABIS ${ANDROID_SUPPORTED_ABIS_${__arch}} ) -endforeach() -unset( __uniqToolchainArchNames ) -if( NOT ANDROID_SUPPORTED_ABIS ) - message( FATAL_ERROR "No one of known Android ABIs is supported by this cmake toolchain." ) -endif() - -# choose target ABI -__INIT_VARIABLE( ANDROID_ABI VALUES ${ANDROID_SUPPORTED_ABIS} ) -# verify that target ABI is supported -list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx ) -if( __androidAbiIdx EQUAL -1 ) - string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS "${ANDROID_SUPPORTED_ABIS}" ) - message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain. - Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\" - " ) -endif() -unset( __androidAbiIdx ) - -# set target ABI options -if( ANDROID_ABI STREQUAL "x86" ) - set( X86 true ) - set( ANDROID_NDK_ABI_NAME "x86" ) - set( ANDROID_ARCH_NAME "x86" ) - set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "i686" ) -elseif( ANDROID_ABI STREQUAL "x86_64" ) - set( X86 true ) - set( X86_64 true ) - set( ANDROID_NDK_ABI_NAME "x86_64" ) - set( ANDROID_ARCH_NAME "x86_64" ) - set( CMAKE_SYSTEM_PROCESSOR "x86_64" ) - set( ANDROID_LLVM_TRIPLE "x86_64-none-linux-android" ) -elseif( ANDROID_ABI STREQUAL "mips64" ) - set( MIPS64 true ) - set( ANDROID_NDK_ABI_NAME "mips64" ) - set( ANDROID_ARCH_NAME "mips64" ) - set( ANDROID_LLVM_TRIPLE "mips64el-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "mips64" ) -elseif( ANDROID_ABI STREQUAL "mips" ) - set( MIPS true ) - set( ANDROID_NDK_ABI_NAME "mips" ) - set( ANDROID_ARCH_NAME "mips" ) - set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "mips" ) -elseif( ANDROID_ABI STREQUAL "arm64-v8a" ) - set( ARM64_V8A true ) - set( ANDROID_NDK_ABI_NAME "arm64-v8a" ) - set( ANDROID_ARCH_NAME "arm64" ) - set( ANDROID_LLVM_TRIPLE "aarch64-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "aarch64" ) - set( VFPV3 true ) - set( NEON true ) -elseif( ANDROID_ABI STREQUAL "armeabi" ) - set( ARMEABI true ) - set( ANDROID_NDK_ABI_NAME "armeabi" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv5te" ) -elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" ) - set( ARMEABI_V6 true ) - set( ANDROID_NDK_ABI_NAME "armeabi" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv6" ) - # need always fallback to older platform - set( ARMEABI true ) -elseif( ANDROID_ABI STREQUAL "armeabi-v7a") - set( ARMEABI_V7A true ) - set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) -elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" ) - set( ARMEABI_V7A true ) - set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) - set( VFPV3 true ) -elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" ) - set( ARMEABI_V7A true ) - set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) - set( VFPV3 true ) - set( NEON true ) -else() - message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." ) -endif() - -if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" ) - # really dirty hack - # it is not possible to change CMAKE_SYSTEM_PROCESSOR after the first run... - file( APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" "SET(CMAKE_SYSTEM_PROCESSOR \"${CMAKE_SYSTEM_PROCESSOR}\")\n" ) -endif() - -if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 ) - __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD VALUES OFF ) - set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE ) - mark_as_advanced( ANDROID_FORCE_ARM_BUILD ) -else() - unset( ANDROID_FORCE_ARM_BUILD CACHE ) -endif() - -# choose toolchain -if( ANDROID_TOOLCHAIN_NAME ) - list( FIND __availableToolchains "${ANDROID_TOOLCHAIN_NAME}" __toolchainIdx ) - if( __toolchainIdx EQUAL -1 ) - list( SORT __availableToolchains ) - string( REPLACE ";" "\n * " toolchains_list "${__availableToolchains}" ) - set( toolchains_list " * ${toolchains_list}") - message( FATAL_ERROR "Specified toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is missing in your NDK or broken. Please verify that your NDK is working or select another compiler toolchain. -To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" ) - endif() - list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch ) - if( NOT __toolchainArch STREQUAL ANDROID_ARCH_NAME ) - message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." ) - endif() -else() - set( __toolchainIdx -1 ) - set( __applicableToolchains "" ) - set( __toolchainMaxVersion "0.0.0" ) - list( LENGTH __availableToolchains __availableToolchainsCount ) - math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" ) - foreach( __idx RANGE ${__availableToolchainsCount} ) - list( GET __availableToolchainArchs ${__idx} __toolchainArch ) - if( __toolchainArch STREQUAL ANDROID_ARCH_NAME ) - list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion ) - string( REPLACE "x" "99" __toolchainVersion "${__toolchainVersion}") - if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion ) - set( __toolchainMaxVersion "${__toolchainVersion}" ) - set( __toolchainIdx ${__idx} ) - endif() - endif() - endforeach() - unset( __availableToolchainsCount ) - unset( __toolchainMaxVersion ) - unset( __toolchainVersion ) -endif() -unset( __toolchainArch ) -if( __toolchainIdx EQUAL -1 ) - message( FATAL_ERROR "No one of available compiler toolchains is able to compile for ${ANDROID_ARCH_NAME} platform." ) -endif() -list( GET __availableToolchains ${__toolchainIdx} ANDROID_TOOLCHAIN_NAME ) -list( GET __availableToolchainMachines ${__toolchainIdx} ANDROID_TOOLCHAIN_MACHINE_NAME ) -list( GET __availableToolchainCompilerVersions ${__toolchainIdx} ANDROID_COMPILER_VERSION ) - -unset( __toolchainIdx ) -unset( __availableToolchains ) -unset( __availableToolchainMachines ) -unset( __availableToolchainArchs ) -unset( __availableToolchainCompilerVersions ) - -# choose native API level -__INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL ) -string( REPLACE "android-" "" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" ) -string( STRIP "${ANDROID_NATIVE_API_LEVEL}" ANDROID_NATIVE_API_LEVEL ) -# adjust API level -set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} ) -foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - if( (__level LESS ANDROID_NATIVE_API_LEVEL OR __level STREQUAL ANDROID_NATIVE_API_LEVEL) AND NOT __level LESS __real_api_level ) - set( __real_api_level ${__level} ) - endif() -endforeach() -if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL STREQUAL __real_api_level ) - message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'") - set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} ) -endif() -unset(__real_api_level) -# validate -list( FIND ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_NATIVE_API_LEVEL}" __levelIdx ) -if( __levelIdx EQUAL -1 ) - message( SEND_ERROR "Specified Android native API level 'android-${ANDROID_NATIVE_API_LEVEL}' is not supported by your NDK/toolchain." ) -else() - if( BUILD_WITH_ANDROID_NDK ) - __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" ) - if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL AND NOT __realApiLevel GREATER 9000 ) - message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." ) - endif() - unset( __realApiLevel ) - endif() - set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE ) - set( CMAKE_ANDROID_API ${ANDROID_NATIVE_API_LEVEL} ) - if( CMAKE_VERSION VERSION_GREATER "2.8" ) - list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS ) - set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - endif() -endif() -unset( __levelIdx ) - - -# remember target ABI -set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE ) -if( CMAKE_VERSION VERSION_GREATER "2.8" ) - list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} ) - set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} ) -endif() - - -# runtime choice (STL, rtti, exceptions) -if( NOT ANDROID_STL ) - set( ANDROID_STL gnustl_static ) -endif() -set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" ) -set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" ) -mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES ) - -if( BUILD_WITH_ANDROID_NDK ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared)$") - message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". -The possible values are: - none -> Do not configure the runtime. - system -> Use the default minimal system C++ runtime library. - system_re -> Same as system but with rtti and exceptions. - gabi++_static -> Use the GAbi++ runtime as a static library. - gabi++_shared -> Use the GAbi++ runtime as a shared library. - stlport_static -> Use the STLport runtime as a static library. - stlport_shared -> Use the STLport runtime as a shared library. - gnustl_static -> (default) Use the GNU STL as a static library. - gnustl_shared -> Use the GNU STL as a shared library. -" ) - endif() -elseif( BUILD_WITH_STANDALONE_TOOLCHAIN ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$") - message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". -The possible values are: - none -> Do not configure the runtime. - gnustl_static -> (default) Use the GNU STL as a static library. - gnustl_shared -> Use the GNU STL as a shared library. -" ) - endif() -endif() - -unset( ANDROID_RTTI ) -unset( ANDROID_EXCEPTIONS ) -unset( ANDROID_STL_INCLUDE_DIRS ) -unset( __libstl ) -unset( __libsupcxx ) - -if( NOT _CMAKE_IN_TRY_COMPILE AND ANDROID_NDK_RELEASE STREQUAL "r7b" AND ARMEABI_V7A AND NOT VFPV3 AND ANDROID_STL MATCHES "gnustl" ) - message( WARNING "The GNU STL armeabi-v7a binaries from NDK r7b can crash non-NEON devices. The files provided with NDK r7b were not configured properly, resulting in crashes on Tegra2-based devices and others when trying to use certain floating-point functions (e.g., cosf, sinf, expf). -You are strongly recommended to switch to another NDK release. -" ) -endif() - -if( NOT _CMAKE_IN_TRY_COMPILE AND X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" ) - message( WARNING "The x86 system header file from NDK r6 has incorrect definition for ptrdiff_t. You are recommended to upgrade to a newer NDK release or manually patch the header: -See https://android.googlesource.com/platform/development.git f907f4f9d4e56ccc8093df6fee54454b8bcab6c2 - diff --git a/ndk/platforms/android-9/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h - index 5e28c64..65892a1 100644 - --- a/ndk/platforms/android-9/arch-x86/include/machine/_types.h - +++ b/ndk/platforms/android-9/arch-x86/include/machine/_types.h - @@ -51,7 +51,11 @@ typedef long int ssize_t; - #endif - #ifndef _PTRDIFF_T - #define _PTRDIFF_T - -typedef long ptrdiff_t; - +# ifdef __ANDROID__ - + typedef int ptrdiff_t; - +# else - + typedef long ptrdiff_t; - +# endif - #endif -" ) -endif() - - -# setup paths and STL for standalone toolchain -if( BUILD_WITH_STANDALONE_TOOLCHAIN ) - set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) - set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) - set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" ) - - if( NOT ANDROID_STL STREQUAL "none" ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/include/c++/${ANDROID_COMPILER_VERSION}" ) - if( NOT EXISTS "${ANDROID_STL_INCLUDE_DIRS}" ) - # old location ( pre r8c ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" ) - endif() - if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" ) - list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" ) - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" ) - list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb" ) - else() - list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" ) - endif() - # always search static GNU STL to get the location of libsupc++.a - if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" ) - elseif( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}" ) - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb" ) - elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" ) - endif() - if( __libstl ) - set( __libsupcxx "${__libstl}/libsupc++.a" ) - set( __libstl "${__libstl}/libstdc++.a" ) - endif() - if( NOT EXISTS "${__libsupcxx}" ) - message( FATAL_ERROR "The required libstdsupc++.a is missing in your standalone toolchain. - Usually it happens because of bug in make-standalone-toolchain.sh script from NDK r7, r7b and r7c. - You need to either upgrade to newer NDK or manually copy - $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a - to - ${__libsupcxx} - " ) - endif() - if( ANDROID_STL STREQUAL "gnustl_shared" ) - if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) - elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) - endif() - endif() - endif() -endif() - -# clang -if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" ) - set( ANDROID_COMPILER_IS_CLANG 1 ) - execute_process( COMMAND "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/clang${TOOL_OS_SUFFIX}" --version OUTPUT_VARIABLE ANDROID_CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}") -elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" ) - string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}") - string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-${ANDROID_COMPILER_VERSION}" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) - if( NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}/bin/clang${TOOL_OS_SUFFIX}" ) - message( FATAL_ERROR "Could not find the Clang compiler driver" ) - endif() - set( ANDROID_COMPILER_IS_CLANG 1 ) - set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) -else() - set( ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) - unset( ANDROID_COMPILER_IS_CLANG CACHE ) -endif() - -string( REPLACE "." "" _clang_name "clang${ANDROID_CLANG_VERSION}" ) -if( NOT EXISTS "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" ) - set( _clang_name "clang" ) -endif() - - -# setup paths and STL for NDK -if( BUILD_WITH_ANDROID_NDK ) - set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) - set( ANDROID_SYSROOT "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}" ) - - if( ANDROID_STL STREQUAL "none" ) - # do nothing - elseif( ANDROID_STL STREQUAL "system" ) - set( ANDROID_RTTI OFF ) - set( ANDROID_EXCEPTIONS OFF ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) - elseif( ANDROID_STL STREQUAL "system_re" ) - set( ANDROID_RTTI ON ) - set( ANDROID_EXCEPTIONS ON ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) - elseif( ANDROID_STL MATCHES "gabi" ) - if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - message( FATAL_ERROR "gabi++ is not available in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.") - endif() - set( ANDROID_RTTI ON ) - set( ANDROID_EXCEPTIONS OFF ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" ) - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" ) - elseif( ANDROID_STL MATCHES "stlport" ) - if( NOT ANDROID_NDK_RELEASE_NUM LESS 8004 ) # before r8d - set( ANDROID_EXCEPTIONS ON ) - else() - set( ANDROID_EXCEPTIONS OFF ) - endif() - if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - set( ANDROID_RTTI OFF ) - else() - set( ANDROID_RTTI ON ) - endif() - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/stlport/stlport" ) - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/stlport/libs/${ANDROID_NDK_ABI_NAME}/libstlport_static.a" ) - elseif( ANDROID_STL MATCHES "gnustl" ) - set( ANDROID_EXCEPTIONS ON ) - set( ANDROID_RTTI ON ) - if( EXISTS "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) - if( ARMEABI_V7A AND ANDROID_COMPILER_VERSION VERSION_EQUAL "4.7" AND ANDROID_NDK_RELEASE STREQUAL "r8d" ) - # gnustl binary for 4.7 compiler is buggy :( - # TODO: look for right fix - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.6" ) - else() - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) - endif() - else() - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" ) - endif() - set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libstl}/include/backward" ) - if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) - set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) - else() - set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" ) - endif() - else() - message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) - endif() - # find libsupc++.a - rtti & exceptions - if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" ) - set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r8b or newer - if( NOT EXISTS "${__libsupcxx}" ) - set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r7-r8 - endif() - if( NOT EXISTS "${__libsupcxx}" ) # before r7 - if( ARMEABI_V7A ) - if( ANDROID_FORCE_ARM_BUILD ) - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libsupc++.a" ) - else() - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libsupc++.a" ) - endif() - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD ) - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libsupc++.a" ) - else() - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libsupc++.a" ) - endif() - endif() - if( NOT EXISTS "${__libsupcxx}") - message( ERROR "Could not find libsupc++.a for a chosen platform. Either your NDK is not supported or is broken.") - endif() - endif() -endif() - - -# case of shared STL linkage -if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl ) - string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" ) - # TODO: check if .so file exists before the renaming -endif() - - -# ccache support -__INIT_VARIABLE( _ndk_ccache NDK_CCACHE ENV_NDK_CCACHE ) -if( _ndk_ccache ) - if( DEFINED NDK_CCACHE AND NOT EXISTS NDK_CCACHE ) - unset( NDK_CCACHE CACHE ) - endif() - find_program( NDK_CCACHE "${_ndk_ccache}" DOC "The path to ccache binary") -else() - unset( NDK_CCACHE CACHE ) -endif() -unset( _ndk_ccache ) - - -# setup the cross-compiler -if( NOT CMAKE_C_COMPILER ) - if( NDK_CCACHE AND NOT ANDROID_SYSROOT MATCHES "[ ;\"]" ) - set( CMAKE_C_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C compiler" ) - set( CMAKE_CXX_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C++ compiler" ) - if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") - set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") - else() - set( CMAKE_C_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") - set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") - endif() - else() - if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") - set( CMAKE_CXX_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") - else() - set( CMAKE_C_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler" ) - set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler" ) - endif() - endif() - set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "assembler" ) - set( CMAKE_STRIP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}" CACHE PATH "strip" ) - if( EXISTS "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" ) - # Use gcc-ar if we have it for better LTO support. - set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) - else() - set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) - endif() - set( CMAKE_LINKER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}" CACHE PATH "linker" ) - set( CMAKE_NM "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-nm${TOOL_OS_SUFFIX}" CACHE PATH "nm" ) - set( CMAKE_OBJCOPY "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objcopy${TOOL_OS_SUFFIX}" CACHE PATH "objcopy" ) - set( CMAKE_OBJDUMP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objdump${TOOL_OS_SUFFIX}" CACHE PATH "objdump" ) - set( CMAKE_RANLIB "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ranlib${TOOL_OS_SUFFIX}" CACHE PATH "ranlib" ) -endif() - -set( _CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_MACHINE_NAME}-" ) -if( CMAKE_VERSION VERSION_LESS 2.8.5 ) - set( CMAKE_ASM_COMPILER_ARG1 "-c" ) -endif() -if( APPLE ) - find_program( CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool ) - if( NOT CMAKE_INSTALL_NAME_TOOL ) - message( FATAL_ERROR "Could not find install_name_tool, please check your installation." ) - endif() - mark_as_advanced( CMAKE_INSTALL_NAME_TOOL ) -endif() - -# Force set compilers because standard identification works badly for us -include( CMakeForceCompiler ) -CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU ) -if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER_ID Clang ) -endif() -set( CMAKE_C_PLATFORM_ID Linux ) -if( X86_64 OR MIPS64 OR ARM64_V8A ) - set( CMAKE_C_SIZEOF_DATA_PTR 8 ) -else() - set( CMAKE_C_SIZEOF_DATA_PTR 4 ) -endif() -set( CMAKE_C_HAS_ISYSROOT 1 ) -set( CMAKE_C_COMPILER_ABI ELF ) -CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU ) -if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_CXX_COMPILER_ID Clang) -endif() -set( CMAKE_CXX_PLATFORM_ID Linux ) -set( CMAKE_CXX_SIZEOF_DATA_PTR ${CMAKE_C_SIZEOF_DATA_PTR} ) -set( CMAKE_CXX_HAS_ISYSROOT 1 ) -set( CMAKE_CXX_COMPILER_ABI ELF ) -set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C ) -# force ASM compiler (required for CMake < 2.8.5) -set( CMAKE_ASM_COMPILER_ID_RUN TRUE ) -set( CMAKE_ASM_COMPILER_ID GNU ) -set( CMAKE_ASM_COMPILER_WORKS TRUE ) -set( CMAKE_ASM_COMPILER_FORCED TRUE ) -set( CMAKE_COMPILER_IS_GNUASM 1) -set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm ) - -foreach( lang C CXX ASM ) - if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_CLANG_VERSION} ) - else() - set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_COMPILER_VERSION} ) - endif() -endforeach() - -# flags and definitions -remove_definitions( -DANDROID ) -add_definitions( -DANDROID ) - -if( ANDROID_SYSROOT MATCHES "[ ;\"]" ) - if( CMAKE_HOST_WIN32 ) - # try to convert path to 8.3 form - file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "@echo %~s1" ) - execute_process( COMMAND "$ENV{ComSpec}" /c "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "${ANDROID_SYSROOT}" - OUTPUT_VARIABLE __path OUTPUT_STRIP_TRAILING_WHITESPACE - RESULT_VARIABLE __result ERROR_QUIET ) - if( __result EQUAL 0 ) - file( TO_CMAKE_PATH "${__path}" ANDROID_SYSROOT ) - set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" ) - else() - set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" ) - endif() - else() - set( ANDROID_CXX_FLAGS "'--sysroot=${ANDROID_SYSROOT}'" ) - endif() - if( NOT _CMAKE_IN_TRY_COMPILE ) - # quotes can break try_compile and compiler identification - message(WARNING "Path to your Android NDK (or toolchain) has non-alphanumeric symbols.\nThe build might be broken.\n") - endif() -else() - set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" ) -endif() - -# NDK flags -if (ARM64_V8A ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) - set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) - endif() -elseif( ARMEABI OR ARMEABI_V7A) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) - if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 ) - set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -finline-limit=64" ) - endif() - else() - # always compile ARMEABI_V6 in arm mode; otherwise there is no difference from ARMEABI - set( ANDROID_CXX_FLAGS_RELEASE "-marm -fomit-frame-pointer -fstrict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) - endif() - endif() -elseif( X86 OR X86_64 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) - endif() - set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) -elseif( MIPS OR MIPS64 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0" ) - set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" ) - set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers" ) - set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) - endif() -elseif() - set( ANDROID_CXX_FLAGS_RELEASE "" ) - set( ANDROID_CXX_FLAGS_DEBUG "" ) -endif() - -set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fsigned-char" ) # good/necessary when porting desktop libraries - -if( NOT X86 AND NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "-Wno-psabi ${ANDROID_CXX_FLAGS}" ) -endif() - -if( NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.6" ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -no-canonical-prefixes" ) # see https://android-review.googlesource.com/#/c/47564/ -endif() - -# ABI-specific flags -if( ARMEABI_V7A ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" ) - if( NEON ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" ) - elseif( VFPV3 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" ) - else() - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" ) - endif() -elseif( ARMEABI_V6 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv6 -mfloat-abi=softfp -mfpu=vfp" ) # vfp == vfpv2 -elseif( ARMEABI ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv5te -mtune=xscale -msoft-float" ) -endif() - -if( ANDROID_STL MATCHES "gnustl" AND (EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}") ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY " -o " ) - set( CMAKE_CXX_CREATE_SHARED_MODULE " -o " ) - set( CMAKE_CXX_LINK_EXECUTABLE " -o " ) -else() - set( CMAKE_CXX_CREATE_SHARED_LIBRARY " -o " ) - set( CMAKE_CXX_CREATE_SHARED_MODULE " -o " ) - set( CMAKE_CXX_LINK_EXECUTABLE " -o " ) -endif() - -# STL -if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" ) - if( EXISTS "${__libstl}" ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libstl}\"" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libstl}\"" ) - set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libstl}\"" ) - endif() - if( EXISTS "${__libsupcxx}" ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" ) - set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libsupcxx}\"" ) - # C objects: - set( CMAKE_C_CREATE_SHARED_LIBRARY " -o " ) - set( CMAKE_C_CREATE_SHARED_MODULE " -o " ) - set( CMAKE_C_LINK_EXECUTABLE " -o " ) - set( CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" ) - set( CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" ) - set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} \"${__libsupcxx}\"" ) - endif() - if( ANDROID_STL MATCHES "gnustl" ) - if( NOT EXISTS "${ANDROID_LIBM_PATH}" ) - set( ANDROID_LIBM_PATH -lm ) - endif() - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} ${ANDROID_LIBM_PATH}" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} ${ANDROID_LIBM_PATH}" ) - set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_LIBM_PATH}" ) - endif() -endif() - -# variables controlling optional build flags -if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - # libGLESv2.so in NDK's prior to r7 refers to missing external symbols. - # So this flag option is required for all projects using OpenGL from native. - __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES ON ) -else() - __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES OFF ) -endif() -__INIT_VARIABLE( ANDROID_NO_UNDEFINED VALUES ON ) -__INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING VALUES ON ) -__INIT_VARIABLE( ANDROID_GOLD_LINKER VALUES ON ) -__INIT_VARIABLE( ANDROID_NOEXECSTACK VALUES ON ) -__INIT_VARIABLE( ANDROID_RELRO VALUES ON ) - -set( ANDROID_NO_UNDEFINED ${ANDROID_NO_UNDEFINED} CACHE BOOL "Show all undefined symbols as linker errors" ) -set( ANDROID_SO_UNDEFINED ${ANDROID_SO_UNDEFINED} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) -set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Put each function in separate section and enable garbage collection of unused input sections at link time" ) -set( ANDROID_GOLD_LINKER ${ANDROID_GOLD_LINKER} CACHE BOOL "Enables gold linker" ) -set( ANDROID_NOEXECSTACK ${ANDROID_NOEXECSTACK} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) -set( ANDROID_RELRO ${ANDROID_RELRO} CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" ) -mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO ) - -# linker flags -set( ANDROID_LINKER_FLAGS "" ) - -if( ARMEABI_V7A ) - # this is *required* to use the following linker flags that routes around - # a CPU bug in some Cortex-A8 implementations: - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--fix-cortex-a8" ) -endif() - -if( ANDROID_NO_UNDEFINED ) - if( MIPS ) - # there is some sysroot-related problem in mips linker... - if( NOT ANDROID_SYSROOT MATCHES "[ ;\"]" ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib" ) - endif() - else() - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" ) - endif() -endif() - -if( ANDROID_SO_UNDEFINED ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-allow-shlib-undefined" ) -endif() - -if( ANDROID_FUNCTION_LEVEL_LINKING ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" ) -endif() - -if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" ) - if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" ) - elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" ) - elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342 - On Linux and OS X host platform you can workaround this problem using gold linker (default). - Rerun cmake with -DANDROID_GOLD_LINKER=ON option in case of problems. -" ) - endif() -endif() # version 4.6 - -if( ANDROID_NOEXECSTACK ) - if( ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -Xclang -mnoexecstack" ) - else() - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -Wa,--noexecstack" ) - endif() - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,noexecstack" ) -endif() - -if( ANDROID_RELRO ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now" ) -endif() - -if( ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} -Qunused-arguments ${ANDROID_CXX_FLAGS}" ) - if( BUILD_WITH_ANDROID_NDK ) - set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" ) - endif() -endif() - -# cache flags -set( CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags" ) -set( CMAKE_C_FLAGS "" CACHE STRING "c flags" ) -set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "c++ Release flags" ) -set( CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "c Release flags" ) -set( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c++ Debug flags" ) -set( CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c Debug flags" ) -set( CMAKE_SHARED_LINKER_FLAGS "" CACHE STRING "shared linker flags" ) -set( CMAKE_MODULE_LINKER_FLAGS "" CACHE STRING "module linker flags" ) -set( CMAKE_EXE_LINKER_FLAGS "-Wl,-z,nocopyreloc" CACHE STRING "executable linker flags" ) - -# put flags to cache (for debug purpose only) -set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" CACHE INTERNAL "Android specific c/c++ flags" ) -set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE}" CACHE INTERNAL "Android specific c/c++ Release flags" ) -set( ANDROID_CXX_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG}" CACHE INTERNAL "Android specific c/c++ Debug flags" ) -set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS}" CACHE INTERNAL "Android specific c/c++ linker flags" ) - -# finish flags -set( CMAKE_CXX_FLAGS "${ANDROID_CXX_FLAGS} ${CMAKE_CXX_FLAGS}" ) -set( CMAKE_C_FLAGS "${ANDROID_CXX_FLAGS} ${CMAKE_C_FLAGS}" ) -set( CMAKE_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELEASE}" ) -set( CMAKE_C_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}" ) -set( CMAKE_CXX_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_DEBUG}" ) -set( CMAKE_C_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}" ) -set( CMAKE_SHARED_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" ) -set( CMAKE_MODULE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" ) -set( CMAKE_EXE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" ) - -if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" ) - set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" ) - set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" ) - set( CMAKE_EXE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" ) -endif() - -# pie/pic -if( NOT (ANDROID_NATIVE_API_LEVEL LESS 16) AND (NOT DEFINED ANDROID_APP_PIE OR ANDROID_APP_PIE) AND (CMAKE_VERSION VERSION_GREATER 2.8.8) ) - set( CMAKE_POSITION_INDEPENDENT_CODE TRUE ) - set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie") -else() - set( CMAKE_POSITION_INDEPENDENT_CODE FALSE ) - set( CMAKE_CXX_FLAGS "-fpic ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-fpic ${CMAKE_C_FLAGS}" ) -endif() - -# configure rtti -if( DEFINED ANDROID_RTTI AND ANDROID_STL_FORCE_FEATURES ) - if( ANDROID_RTTI ) - set( CMAKE_CXX_FLAGS "-frtti ${CMAKE_CXX_FLAGS}" ) - else() - set( CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}" ) - endif() -endif() - -# configure exceptios -if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES ) - if( ANDROID_EXCEPTIONS ) - set( CMAKE_CXX_FLAGS "-fexceptions ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-fexceptions ${CMAKE_C_FLAGS}" ) - else() - set( CMAKE_CXX_FLAGS "-fno-exceptions ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-fno-exceptions ${CMAKE_C_FLAGS}" ) - endif() -endif() - -# global includes and link directories -include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} ) -get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning -link_directories( "${__android_install_path}" ) - -# detect if need link crtbegin_so.o explicitly -if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK ) - set( __cmd "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" ) - string( REPLACE "" "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_CXX_FLAGS}" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_SHARED_LINKER_FLAGS}" __cmd "${__cmd}" ) - string( REPLACE "" "-shared" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain_crtlink_test.so" __cmd "${__cmd}" ) - string( REPLACE "" "\"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - separate_arguments( __cmd ) - foreach( __var ANDROID_NDK ANDROID_NDK_TOOLCHAINS_PATH ANDROID_STANDALONE_TOOLCHAIN ) - if( ${__var} ) - set( __tmp "${${__var}}" ) - separate_arguments( __tmp ) - string( REPLACE "${__tmp}" "${${__var}}" __cmd "${__cmd}") - endif() - endforeach() - string( REPLACE "'" "" __cmd "${__cmd}" ) - string( REPLACE "\"" "" __cmd "${__cmd}" ) - execute_process( COMMAND ${__cmd} RESULT_VARIABLE __cmd_result OUTPUT_QUIET ERROR_QUIET ) - if( __cmd_result EQUAL 0 ) - set( ANDROID_EXPLICIT_CRT_LINK ON ) - else() - set( ANDROID_EXPLICIT_CRT_LINK OFF ) - endif() -endif() - -if( ANDROID_EXPLICIT_CRT_LINK ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" ) -endif() - -# setup output directories -set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) - -if( DEFINED LIBRARY_OUTPUT_PATH_ROOT - OR EXISTS "${CMAKE_SOURCE_DIR}/AndroidManifest.xml" - OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") ) - set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" ) - if( NOT _CMAKE_IN_TRY_COMPILE ) - if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) - else() - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) - endif() - set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for Android libs" ) - endif() -endif() - -# copy shaed stl library to build directory -if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" AND DEFINED LIBRARY_OUTPUT_PATH ) - get_filename_component( __libstlname "${__libstl}" NAME ) - execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) - if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") - message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) - endif() - unset( __fileCopyProcess ) - unset( __libstlname ) -endif() - - -# set these global flags for cmake client scripts to change behavior -set( ANDROID True ) -set( BUILD_ANDROID True ) - -# where is the target environment -set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_ROOT}/bin" "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" "${ANDROID_SYSROOT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" ) - -# only search for libraries and includes in the ndk toolchain -set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) -set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) -set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) - - -# macro to find packages on the host OS -macro( find_host_package ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER ) - if( CMAKE_HOST_WIN32 ) - SET( WIN32 1 ) - SET( UNIX ) - elseif( CMAKE_HOST_APPLE ) - SET( APPLE 1 ) - SET( UNIX ) - endif() - find_package( ${ARGN} ) - SET( WIN32 ) - SET( APPLE ) - SET( UNIX 1 ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) -endmacro() - - -# macro to find programs on the host OS -macro( find_host_program ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER ) - if( CMAKE_HOST_WIN32 ) - SET( WIN32 1 ) - SET( UNIX ) - elseif( CMAKE_HOST_APPLE ) - SET( APPLE 1 ) - SET( UNIX ) - endif() - find_program( ${ARGN} ) - SET( WIN32 ) - SET( APPLE ) - SET( UNIX 1 ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) -endmacro() - - -# export toolchain settings for the try_compile() command -if( NOT _CMAKE_IN_TRY_COMPILE ) - set( __toolchain_config "") - foreach( __var NDK_CCACHE LIBRARY_OUTPUT_PATH_ROOT ANDROID_FORBID_SYGWIN - ANDROID_NDK_HOST_X64 - ANDROID_NDK - ANDROID_NDK_LAYOUT - ANDROID_STANDALONE_TOOLCHAIN - ANDROID_TOOLCHAIN_NAME - ANDROID_ABI - ANDROID_NATIVE_API_LEVEL - ANDROID_STL - ANDROID_STL_FORCE_FEATURES - ANDROID_FORCE_ARM_BUILD - ANDROID_NO_UNDEFINED - ANDROID_SO_UNDEFINED - ANDROID_FUNCTION_LEVEL_LINKING - ANDROID_GOLD_LINKER - ANDROID_NOEXECSTACK - ANDROID_RELRO - ANDROID_LIBM_PATH - ANDROID_EXPLICIT_CRT_LINK - ANDROID_APP_PIE - ) - if( DEFINED ${__var} ) - if( ${__var} MATCHES " ") - set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" ) - else() - set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" ) - endif() - endif() - endforeach() - file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/android.toolchain.config.cmake" "${__toolchain_config}" ) - unset( __toolchain_config ) -endif() - - -# force cmake to produce / instead of \ in build commands for Ninja generator -if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 ) - # it is a bad hack after all - # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW - set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW - set( CMAKE_CROSSCOMPILING TRUE ) # stop recursion - enable_language( C ) - enable_language( CXX ) - # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it - unset( MINGW ) -endif() - - -# Variables controlling behavior or set by cmake toolchain: -# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64" -# ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version) -# ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none -# ANDROID_FORBID_SYGWIN : ON/OFF -# ANDROID_NO_UNDEFINED : ON/OFF -# ANDROID_SO_UNDEFINED : OFF/ON (default depends on NDK version) -# ANDROID_FUNCTION_LEVEL_LINKING : ON/OFF -# ANDROID_GOLD_LINKER : ON/OFF -# ANDROID_NOEXECSTACK : ON/OFF -# ANDROID_RELRO : ON/OFF -# ANDROID_FORCE_ARM_BUILD : ON/OFF -# ANDROID_STL_FORCE_FEATURES : ON/OFF -# ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product//obj/lib/libm.so) to workaround unresolved `sincos` -# Can be set only at the first run: -# ANDROID_NDK : path to your NDK install -# NDK_CCACHE : path to your ccache executable -# ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain -# ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems) -# ANDROID_NDK_LAYOUT : the inner NDK structure (RELEASE, LINARO, ANDROID) -# LIBRARY_OUTPUT_PATH_ROOT : -# ANDROID_STANDALONE_TOOLCHAIN -# -# Primary read-only variables: -# ANDROID : always TRUE -# ARMEABI : TRUE for arm v6 and older devices -# ARMEABI_V6 : TRUE for arm v6 -# ARMEABI_V7A : TRUE for arm v7a -# ARM64_V8A : TRUE for arm64-v8a -# NEON : TRUE if NEON unit is enabled -# VFPV3 : TRUE if VFP version 3 is enabled -# X86 : TRUE if configured for x86 -# X86_64 : TRUE if configured for x86_64 -# MIPS : TRUE if configured for mips -# MIPS64 : TRUE if configured for mips64 -# BUILD_WITH_ANDROID_NDK : TRUE if NDK is used -# BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used -# ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform -# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI -# ANDROID_NDK_RELEASE : from r5 to r10d; set only for NDK -# ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor) -# ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI -# ANDROID_SYSROOT : path to the compiler sysroot -# TOOL_OS_SUFFIX : "" or ".exe" depending on host platform -# ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used -# -# Secondary (less stable) read-only variables: -# ANDROID_COMPILER_VERSION : GCC version used (not Clang version) -# ANDROID_CLANG_VERSION : version of clang compiler if clang is used -# ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform -# ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI -# ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux" -# ANDROID_TOOLCHAIN_ROOT : path to the top level of toolchain (standalone or placed inside NDK) -# ANDROID_CLANG_TOOLCHAIN_ROOT : path to clang tools -# ANDROID_SUPPORTED_NATIVE_API_LEVELS : list of native API levels found inside NDK -# ANDROID_STL_INCLUDE_DIRS : stl include paths -# ANDROID_RTTI : if rtti is enabled by the runtime -# ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime -# ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used -# -# Defaults: -# ANDROID_DEFAULT_NDK_API_LEVEL -# ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH} -# ANDROID_NDK_SEARCH_PATHS -# ANDROID_SUPPORTED_ABIS_${ARCH} -# ANDROID_SUPPORTED_NDK_VERSIONS diff --git a/Externals/CMakeModules/Android/ndk_links.md b/Externals/CMakeModules/Android/ndk_links.md deleted file mode 100644 index 6d93d61..0000000 --- a/Externals/CMakeModules/Android/ndk_links.md +++ /dev/null @@ -1,211 +0,0 @@ - -============== r1 ============== (dead links) - -* http://dl.google.com/android/ndk/android-ndk-1.5_r1-windows.zip -* http://dl.google.com/android/ndk/android-ndk-1.5_r1-darwin-x86.zip -* http://dl.google.com/android/ndk/android-ndk-1.5_r1-linux-x86.zip - -============== r2 ============== - -* http://dl.google.com/android/ndk/android-ndk-1.6_r1-windows.zip -* http://dl.google.com/android/ndk/android-ndk-1.6_r1-darwin-x86.zip -* http://dl.google.com/android/ndk/android-ndk-1.6_r1-linux-x86.zip - -============== r3 ============== - -* http://dl.google.com/android/ndk/android-ndk-r3-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r3-darwin-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r3-linux-x86.zip - -============== r4 ============== - -* http://dl.google.com/android/ndk/android-ndk-r4-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r4-darwin-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r4-linux-x86.zip - -============== r4b ============== - -* http://dl.google.com/android/ndk/android-ndk-r4b-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r4b-darwin-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r4b-linux-x86.zip - -============== r5 ============== - -* http://dl.google.com/android/ndk/android-ndk-r5-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r5-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r5-linux-x86.tar.bz2 - -============== r5b ============== - -* http://dl.google.com/android/ndk/android-ndk-r5b-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r5b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r5b-linux-x86.tar.bz2 - -============== r5c ============== - -* http://dl.google.com/android/ndk/android-ndk-r5c-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r5c-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r5c-linux-x86.tar.bz2 - -============== r6 ============== - -* http://dl.google.com/android/ndk/android-ndk-r6-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r6-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r6-linux-x86.tar.bz2 - -============== r6b ============== - -* http://dl.google.com/android/ndk/android-ndk-r6b-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r6b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r6b-linux-x86.tar.bz2 - -============== r7 ============== - -* http://dl.google.com/android/ndk/android-ndk-r7-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r7-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r7-linux-x86.tar.bz2 - -============== r7b ============== - -* http://dl.google.com/android/ndk/android-ndk-r7b-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r7b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r7b-linux-x86.tar.bz2 - -============== r7c ============== - -* http://dl.google.com/android/ndk/android-ndk-r7c-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r7c-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r7c-linux-x86.tar.bz2 - -============== r8 ============== - -* http://dl.google.com/android/ndk/android-ndk-r8-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r8-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8-linux-x86.tar.bz2 - -============== r8b ============== - -* http://dl.google.com/android/ndk/android-ndk-r8b-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r8b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8b-linux-x86.tar.bz2 - -============== r8c ============== - -* http://dl.google.com/android/ndk/android-ndk-r8c-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r8c-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8c-linux-x86.tar.bz2 - -============== r8d ============== - -* http://dl.google.com/android/ndk/android-ndk-r8d-windows.zip -* http://dl.google.com/android/ndk/android-ndk-r8d-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8d-linux-x86.tar.bz2 - -============== r8e ============== - -* http://dl.google.com/android/ndk/android-ndk-r8e-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r8e-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk-r8e-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8e-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8e-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r8e-linux-x86_64.tar.bz2 - -============== r9 ============== - -* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86-legacy-toolchains.zip -* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86_64-legacy-toolchains.zip -* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86-legacy-toolchains.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86_64-legacy-toolchains.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 - -============== r9b ============== - -* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86-legacy-toolchains.zip -* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86_64-legacy-toolchains.zip -* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86-legacy-toolchains.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86_64-legacy-toolchains.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 - -============== r9c ============== - -* http://dl.google.com/android/ndk/android-ndk-r9c-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r9c-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk-r9c-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9c-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9c-cxx-stl-libs-with-debugging-info.zip - -============== r9d ============== - -* http://dl.google.com/android/ndk/android-ndk-r9d-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk-r9d-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9d-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9d-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r9d-cxx-stl-libs-with-debug-info.zip - -============== r10 ============== - -* http://dl.google.com/android/ndk/android-ndk32-r10-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk32-r10-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk32-r10-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk32-r10-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk64-r10-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk64-r10-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r10-cxx-stl-libs-with-debug-info.zip - -============== r10b ============== - -* http://dl.google.com/android/ndk/android-ndk32-r10b-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk32-r10b-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10b-windows-x86.zip -* http://dl.google.com/android/ndk/android-ndk64-r10b-windows-x86_64.zip -* http://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86_64.tar.bz2 -* http://dl.google.com/android/ndk/android-ndk-r10b-cxx-stl-libs-with-debug-info.zip - -============== r10c ============== - -* http://dl.google.com/android/ndk/android-ndk-r10c-windows-x86.exe -* http://dl.google.com/android/ndk/android-ndk-r10c-windows-x86_64.exe -* http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86.bin -* http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin -* http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86.bin -* http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin - -============== r10d ============== - -* http://dl.google.com/android/ndk/android-ndk-r10d-windows-x86.exe -* http://dl.google.com/android/ndk/android-ndk-r10d-windows-x86_64.exe -* http://dl.google.com/android/ndk/android-ndk-r10d-darwin-x86.bin -* http://dl.google.com/android/ndk/android-ndk-r10d-darwin-x86_64.bin -* http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin -* http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin diff --git a/Externals/CMakeModules/FindGoogleTest.cmake b/Externals/CMakeModules/FindGoogleTest.cmake deleted file mode 100644 index c15e201..0000000 --- a/Externals/CMakeModules/FindGoogleTest.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# - Try to find GoogleTest -# Once done this will define -# GOOGLETEST_FOUND - System has GoogleTest -# GOOGLETEST_INCLUDE_DIR - The GoogleTest include directory -# GOOGLETEST_SRC_DIR - The GoogleTest src directory - -FIND_PATH( GOOGLETEST_INCLUDE_DIR gtest/gtest.h - HINTS - ${GW_DEPS_ROOT}/GoogleTest - ${GW_DEPS_ROOT}/sw/physx/externals/GoogleTest/gtest-1.4.0 - PATH_SUFFIXES include - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH) - -FIND_PATH( GOOGLETEST_SRC_DIR gtest.cpp - HINTS - ${GW_DEPS_ROOT}/GoogleTest - ${GW_DEPS_ROOT}/sw/physx/externals/GoogleTest/gtest-1.4.0 - PATH_SUFFIXES src - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GoogleTest DEFAULT_MSG GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR) - -mark_as_advanced(GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR) diff --git a/Externals/CMakeModules/FindNvSimd.cmake b/Externals/CMakeModules/FindNvSimd.cmake deleted file mode 100644 index 02d152c..0000000 --- a/Externals/CMakeModules/FindNvSimd.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# - Try to find NvSimd -# Once done this will define -# NVSIMD_FOUND - System has NvSimd -# NVSIMD_INCLUDE_DIR - The NvSimd include directories - -# TODO: Support version -FIND_PATH( NVSIMD_INCLUDE_DIR include/NvSimd4f.h - HINTS - ${GW_DEPS_ROOT}/NvSimd - ${GW_DEPS_ROOT}/PxShared/NvSimd - ${GW_DEPS_ROOT}/PxShared/src/NvSimd - ${GW_DEPS_ROOT}/sw/devrel/GameWorks/Shared/NvSimd/${PACKAGE_FIND_VERSION}/trunk - ${GW_DEPS_ROOT}/sw/devrel/GameWorks/Shared/NvSimd/1.1/trunk - ) - -MESSAGE(${NVSIMD_INCLUDE_DIR}) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(NvSimd DEFAULT_MSG NVSIMD_INCLUDE_DIR) - -mark_as_advanced(NVSIMD_INCLUDE_DIR) diff --git a/Externals/CMakeModules/FindPhysX.cmake b/Externals/CMakeModules/FindPhysX.cmake deleted file mode 100644 index 5b07c14..0000000 --- a/Externals/CMakeModules/FindPhysX.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# -# Find PhysX -# -# This is a really dumb finder - it finds the PhysX install we're going to use add_subdirectory on. -# PHYSX_FOUND - System has PhysX -# PHYSX_ROOT_DIR - The PhysX root directory - -# First look for the feature branch, then for the trunk -FIND_PATH( PHYSX_ROOT_DIR Include/PxActor.h - HINTS - ${GW_DEPS_ROOT}/PhysXSDK - ${GW_DEPS_ROOT}/PhysX_3.4 - ${GW_DEPS_ROOT}/sw/physx/PhysXSDK/3.4/trunk - ) - -MESSAGE(${PHYSX_ROOT_DIR}) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysX DEFAULT_MSG PHYSX_ROOT_DIR) - -mark_as_advanced(PHYSX_ROOT_DIR) diff --git a/Externals/CMakeModules/FindPxShared.cmake b/Externals/CMakeModules/FindPxShared.cmake deleted file mode 100644 index 3297996..0000000 --- a/Externals/CMakeModules/FindPxShared.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# - Try to find PxShared -# Once done this will define -# PXSHARED_FOUND - System has PxShared -# PXSHARED_ROOT_DIR - The root of PxShared - -# NOTE: We're including a version in this, but the first hint is without one - we should use that! -FIND_PATH( PXSHARED_ROOT_DIR include/foundation/Px.h - HINTS - ${GW_DEPS_ROOT}/PxShared - ${GW_DEPS_ROOT}/sw/physx/PxShared/1.0/trunk - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxShared DEFAULT_MSG PXSHARED_ROOT_DIR) - -mark_as_advanced(PXSHARED_ROOT_DIR) diff --git a/Externals/CMakeModules/FindPxToolkit.cmake b/Externals/CMakeModules/FindPxToolkit.cmake deleted file mode 100644 index 583899b..0000000 --- a/Externals/CMakeModules/FindPxToolkit.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# - Try to find PXTOOLKIT -# Once done this will define -# PXTOOLKIT_FOUND - System has PXTOOLKIT -# PXTOOLKIT_ROOT - The PXTOOLKIT root directory -# PXTOOLKIT_INCLUDE_DIR - The PXTOOLKIT include directory -# PXTOOLKIT_SRC_DIR - The PXTOOLKIT src directory - -FIND_PATH( PXTOOLKIT_INCLUDE_DIR PxTkBmpLoader.h - HINTS - ${GW_DEPS_ROOT}/PxToolKit - ${GW_DEPS_ROOT}/PhysX_3.4/Samples/PxToolkit - ${GW_DEPS_ROOT}/sw/physx/PhysXSDK/3.4/trunk/Samples/PxToolkit - PATH_SUFFIXES include) - -FIND_PATH( PXTOOLKIT_SRC_DIR PxTkBmpLoader.cpp - HINTS - ${GW_DEPS_ROOT}/PxToolKit - ${GW_DEPS_ROOT}/PhysX_3.4/Samples/PxToolkit - ${GW_DEPS_ROOT}/sw/physx/PhysXSDK/3.4/trunk/Samples/PxToolkit - PATH_SUFFIXES src) - -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxToolKit DEFAULT_MSG PXTOOLKIT_INCLUDE_DIR PXTOOLKIT_SRC_DIR) - -mark_as_advanced(PXTOOLKIT_INCLUDE_DIR PXTOOLKIT_SRC_DIR) diff --git a/Externals/CMakeModules/FindTarga.cmake b/Externals/CMakeModules/FindTarga.cmake deleted file mode 100644 index b042c96..0000000 --- a/Externals/CMakeModules/FindTarga.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# - Try to find Targa -# Once done this will define -# TARGA_FOUND - System has targa -# TARGA_INCLUDE_DIR - The targa include directory -# TARGA_SRC_DIR - The targa src directory - -FIND_PATH( TARGA_INCLUDE_DIR targa.h - HINTS - ${GW_DEPS_ROOT}/externals/targa/1 - ${GW_DEPS_ROOT}/sw/physx/externals/targa/1 - PATH_SUFFIXES include) - -FIND_PATH( TARGA_SRC_DIR targa.cpp - HINTS - ${GW_DEPS_ROOT}/externals/targa/1 - ${GW_DEPS_ROOT}/sw/physx/externals/targa/1 - PATH_SUFFIXES src) - -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Targa DEFAULT_MSG TARGA_INCLUDE_DIR TARGA_SRC_DIR) - -mark_as_advanced(TARGA_INCLUDE_DIR TARGA_SRC_DIR) \ No newline at end of file diff --git a/Externals/CMakeModules/FindnvToolsExt.cmake b/Externals/CMakeModules/FindnvToolsExt.cmake deleted file mode 100644 index 26c00dc..0000000 --- a/Externals/CMakeModules/FindnvToolsExt.cmake +++ /dev/null @@ -1,40 +0,0 @@ -# - Try to find nvToolsExt -# Once done this will define -# NVTOOLSEXT_FOUND - System has nvToolsExt -# NVTOOLSEXT_INCLUDE_DIRS - The nvToolsExt include directories -# NVTOOLSEXT_LIBRARIES - The libraries needed to use nvToolsExt -# NVTOOLSEXT_DEFINITIONS - Compiler switches required for using nvToolsExt - -FIND_PATH( NVTOOLSEXT_INCLUDE_DIRS nvToolsExt.h - HINTS - ${GW_DEPS_ROOT}/nvToolsExt - ${GW_DEPS_ROOT}/Externals/nvToolsExt/1 - ${GW_DEPS_ROOT}/sw/physx/externals/nvToolsExt/1 - PATH_SUFFIXES include) - -INCLUDE(FindPackageHandleStandardArgs) - -IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") - # NOTE: Doesn't make sense for all platforms - ARM - IF(CMAKE_CL_64) - SET(NVTOOLSEXT_LIBNAME "nvToolsExt64_1") - SET(NVTOOLSEXT_LIBPATH_SUFFIX "x64") - ELSE(CMAKE_CL_64) - SET(NVTOOLSEXT_LIBNAME nvToolsExt32_1) - SET(NVTOOLSEXT_LIBPATH_SUFFIX "Win32") - ENDIF(CMAKE_CL_64) - - - FIND_LIBRARY( NVTOOLSEXT_LIBRARIES ${NVTOOLSEXT_LIBNAME} - ${GW_DEPS_ROOT}/nvToolsExt - ${GW_DEPS_ROOT}/Externals/nvToolsExt/1/lib/${NVTOOLSEXT_LIBPATH_SUFFIX} - ${GW_DEPS_ROOT}/sw/physx/externals/nvToolsExt/1/lib/${NVTOOLSEXT_LIBPATH_SUFFIX} - ) - - FIND_PACKAGE_HANDLE_STANDARD_ARGS(nvToolsExt DEFAULT_MSG NVTOOLSEXT_LIBRARIES NVTOOLSEXT_INCLUDE_DIRS) -ELSE() - # Exclude the libraries for non-windows platforms - FIND_PACKAGE_HANDLE_STANDARD_ARGS(nvToolsExt DEFAULT_MSG NVTOOLSEXT_INCLUDE_DIRS) -ENDIF() - -mark_as_advanced(NVTOOLSEXT_INCLUDE_DIRS NVTOOLSEXT_LIBRARIES) \ No newline at end of file diff --git a/Externals/CMakeModules/Linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake b/Externals/CMakeModules/Linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake deleted file mode 100644 index cfe2d64..0000000 --- a/Externals/CMakeModules/Linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake +++ /dev/null @@ -1,37 +0,0 @@ -IF(NOT $ENV{LINUX_ROOT} EQUAL "") - SET(CMAKE_SYSTEM_NAME Linux) - - # FIXME: fix Linux toolchains to support architectures - SET(LINUX_ROOT $ENV{UE_SDKS_ROOT}/HostWin64/Linux_x64/arm-unknown-linux-gnueabihf_v5_clang-3.5.0-ld-2.23.1-glibc-2.13/toolchain) - STRING(REGEX REPLACE "\\\\" "/" LINUX_ROOT ${LINUX_ROOT}) - - message (STATUS "LINUX_ROOT is '${LINUX_ROOT}'") - SET(ARCHITECTURE_TRIPLE arm-unknown-linux-gnueabihf) - - SET(CMAKE_CROSSCOMPILING TRUE) - SET(CMAKE_SYSTEM_NAME Linux) - SET(CMAKE_SYSTEM_VERSION 1) - - # sysroot - SET(CMAKE_SYSROOT ${LINUX_ROOT}) - - SET(CMAKE_LIBRARY_ARCHITECTURE ${ARCHITECTURE_TRIPLE}) - - # specify the cross compiler - SET(CMAKE_C_COMPILER ${CMAKE_SYSROOT}/bin/clang.exe) - SET(CMAKE_C_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) - SET(CMAKE_C_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") - - SET(CMAKE_CXX_COMPILER ${CMAKE_SYSROOT}/bin/clang++.exe) - SET(CMAKE_CXX_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) - SET(CMAKE_CXX_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") - - SET(CMAKE_FIND_ROOT_PATH ${LINUX_ROOT}) - #set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) # hoping to force it to use ar - #set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - #set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -ELSE() - MESSAGE("LINUX_ROOT environment variable not defined!") -ENDIF() - - diff --git a/Externals/CMakeModules/Linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake b/Externals/CMakeModules/Linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake deleted file mode 100644 index a82d145..0000000 --- a/Externals/CMakeModules/Linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake +++ /dev/null @@ -1,36 +0,0 @@ -IF(NOT $ENV{LINUX_ROOT} EQUAL "") - SET(CMAKE_SYSTEM_NAME Linux) - - SET(LINUX_ROOT $ENV{LINUX_ROOT}) - STRING(REGEX REPLACE "\\\\" "/" LINUX_ROOT ${LINUX_ROOT}) - - message (STATUS "LINUX_ROOT is '${LINUX_ROOT}'") - SET(ARCHITECTURE_TRIPLE x86_64-unknown-linux-gnu) - - SET(CMAKE_CROSSCOMPILING TRUE) - SET(CMAKE_SYSTEM_NAME Linux) - SET(CMAKE_SYSTEM_VERSION 1) - - # sysroot - SET(CMAKE_SYSROOT ${LINUX_ROOT}) - - SET(CMAKE_LIBRARY_ARCHITECTURE ${ARCHITECTURE_TRIPLE}) - - # specify the cross compiler - SET(CMAKE_C_COMPILER ${CMAKE_SYSROOT}/bin/clang.exe) - SET(CMAKE_C_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) - SET(CMAKE_C_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") - - SET(CMAKE_CXX_COMPILER ${CMAKE_SYSROOT}/bin/clang++.exe) - SET(CMAKE_CXX_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) - SET(CMAKE_CXX_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") - - SET(CMAKE_FIND_ROOT_PATH ${LINUX_ROOT}) - #set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) # hoping to force it to use ar - #set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - #set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -ELSE() - MESSAGE("LINUX_ROOT environment variable not defined!") -ENDIF() - - diff --git a/Externals/CMakeModules/NvidiaBuildOptions.cmake b/Externals/CMakeModules/NvidiaBuildOptions.cmake deleted file mode 100644 index e5d89af..0000000 --- a/Externals/CMakeModules/NvidiaBuildOptions.cmake +++ /dev/null @@ -1,180 +0,0 @@ -# Define the options up front - -OPTION(APPEND_CONFIG_NAME "Append config (DEBUG, CHECKED, PROFILE or '' for release) to outputted binaries." OFF) -OPTION(USE_GAMEWORKS_OUTPUT_DIRS "Use new GameWorks folder structure for binary output." ON) -OPTION(USE_STATIC_WINCRT "Use the statically linked windows CRT" OFF) -OPTION(USE_DEBUG_WINCRT "Use the debug version of the CRT" OFF) -OPTION(GENERATE_STATIC_LIBRARIES "Generate static libraries" OFF) - -INCLUDE(SetOutputPaths) - - # Set the WINCRT_DEBUG and WINCRT_NDEBUG variables for use in project compile settings - # Really only relevant to windows - - SET(DISABLE_ITERATOR_DEBUGGING "/D \"_HAS_ITERATOR_DEBUGGING=0\" /D \"_ITERATOR_DEBUG_LEVEL=0\"") - SET(DISABLE_ITERATOR_DEBUGGING_CUDA "-D_HAS_ITERATOR_DEBUGGING=0 -D_ITERATOR_DEBUG_LEVEL=0") - SET(CRT_DEBUG_FLAG "/D \"_DEBUG\"") - SET(CRT_NDEBUG_FLAG "/D \"NDEBUG\"") - - # Need a different format for CUDA - SET(CUDA_DEBUG_FLAG "-DNDEBUG ${DISABLE_ITERATOR_DEBUGGING_CUDA}") - SET(CUDA_NDEBUG_FLAG "-DNDEBUG") - - SET(CUDA_CRT_COMPILE_OPTIONS_NDEBUG "") - SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "") - - - IF(USE_STATIC_WINCRT) - SET(WINCRT_NDEBUG "/MT ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") - SET(CUDA_CRT_COMPILE_OPTIONS_NDEBUG "/MT") - - IF (USE_DEBUG_WINCRT) - SET(CUDA_DEBUG_FLAG "-D_DEBUG") - SET(WINCRT_DEBUG "/MTd ${CRT_DEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") - SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MTd") - ELSE() - SET(WINCRT_DEBUG "/MT ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") - SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MT") - ENDIF() - ELSE() - SET(WINCRT_NDEBUG "/MD ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}") - SET(CUDA_CRT_COMPILE_OPTIONS_NDEBUG "/MD") - - IF(USE_DEBUG_WINCRT) - SET(CUDA_DEBUG_FLAG "-D_DEBUG") - SET(WINCRT_DEBUG "/MDd ${CRT_DEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") - SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MDd") - ELSE() - SET(WINCRT_DEBUG "/MD ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") - SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MD") - ENDIF() - ENDIF() - - -IF(USE_GAMEWORKS_OUTPUT_DIRS) - - # New bitness suffix - IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(LIBPATH_SUFFIX "64") - # Set default exe suffix. Unset on platforms that don't need it. Include underscore since it's optional - SET(EXE_SUFFIX "_64") - ELSE() - SET(LIBPATH_SUFFIX "32") - # Set default exe suffix. Unset on platforms that don't need it. Include underscore since it's optional - SET(EXE_SUFFIX "_32") - ENDIF() - - IF (NOT DEFINED PX_OUTPUT_LIB_DIR) - MESSAGE(FATAL_ERROR "When using the GameWorks output structure you must specify PX_OUTPUT_LIB_DIR as the base") - ENDIF() - - IF (NOT DEFINED PX_OUTPUT_BIN_DIR) - MESSAGE(FATAL_ERROR "When using the GameWorks output structure you must specify PX_OUTPUT_BIN_DIR as the base") - ENDIF() - - - INCLUDE(GetCompilerAndPlatform) - # Get the compiler and platform string into COMPILER_AND_PLATFORM - GetCompilerAndPlatform(COMPILER_AND_PLATFORM) - - GetStaticCRTString(CRT_STRING) - - IF(NOT CRT_STRING) # Non windows returns empty string - IF (NOT DEFINED PX_OUTPUT_ARCH) # platforms with fixed arch like ps4 dont need to have arch defined - # Set the path the DLLs and static libs go to - SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}" CACHE INTERNAL "Relative root of the lib output directory") - SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}" CACHE INTERNAL "Relative root dir of the exe output directory") - - # If there's no arch, then no bitness either. - - SET(EXE_SUFFIX "") - ELSE() - # Set the path the DLLs and static libs go to - SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}" CACHE INTERNAL "Relative root of the lib output directory") - SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}" CACHE INTERNAL "Relative root dir of the exe output directory") - ENDIF() - ELSE() - # Set the path the DLLs and static libs go to - SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}/${CRT_STRING}" CACHE INTERNAL "Relative root of the lib output directory") - SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}/${CRT_STRING}" CACHE INTERNAL "Relative root dir of the exe output directory") - ENDIF() - - # Override our normal PX_ROOT_LIB_DIR for Android - IF(TARGET_BUILD_PLATFORM STREQUAL "Android") - SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}/${ANDROID_ABI}/${CM_ANDROID_FP}" CACHE INTERNAL "Relative root of the lib output directory") - ENDIF() - - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/debug" ) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/profile" ) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/checked" ) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/release" ) - - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/debug" ) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/profile" ) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/checked" ) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/release" ) - - # Set the RUNTIME output directories - this is executables, etc. - # Override our normal PX_ROOT_EXE_DIR for Android - IF(TARGET_BUILD_PLATFORM STREQUAL "Android") - SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}/${ANDROID_ABI}/${CM_ANDROID_FP}" CACHE INTERNAL "Relative root dir of the exe output directory") - ENDIF() - - # RFC 108, we're doing EXEs as the special case since there will be presumable be less of those. - SET(PX_EXE_OUTPUT_DIRECTORY_DEBUG "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/debug" CACHE INTERNAL "Directory to put debug exes in") - SET(PX_EXE_OUTPUT_DIRECTORY_PROFILE "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/profile" CACHE INTERNAL "Directory to put profile exes in") - SET(PX_EXE_OUTPUT_DIRECTORY_CHECKED "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/checked" CACHE INTERNAL "Directory to put checked exes in") - SET(PX_EXE_OUTPUT_DIRECTORY_RELEASE "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/release" CACHE INTERNAL "Directory to put release exes in") - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} ) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE} ) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED} ) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} ) - - -ELSE() - # old bitness suffix - IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(LIBPATH_SUFFIX "x64") - ELSE() - SET(LIBPATH_SUFFIX "x86") - ENDIF() - - - IF(DEFINED PX_OUTPUT_EXE_DIR) - SetExeOutputPath(${PX_OUTPUT_EXE_DIR}) - ENDIF() - IF(DEFINED PX_OUTPUT_DLL_DIR) - SetDllOutputPath(${PX_OUTPUT_DLL_DIR}) - ENDIF() - IF(DEFINED PX_OUTPUT_LIB_DIR) - SetLibOutputPath(${PX_OUTPUT_LIB_DIR}) - ENDIF() - # All EXE/DLL/LIB output will be overwritten if PX_OUTPUT_ALL_DIR is defined - IF(DEFINED PX_OUTPUT_ALL_DIR) - SetSingleOutputPath(${PX_OUTPUT_ALL_DIR}) - ENDIF() -ENDIF() - -IF(APPEND_CONFIG_NAME) - SET(CMAKE_DEBUG_POSTFIX "DEBUG_${LIBPATH_SUFFIX}") - SET(CMAKE_PROFILE_POSTFIX "PROFILE_${LIBPATH_SUFFIX}") - SET(CMAKE_CHECKED_POSTFIX "CHECKED_${LIBPATH_SUFFIX}") - SET(CMAKE_RELEASE_POSTFIX "_${LIBPATH_SUFFIX}") -ELSE() - IF (DEFINED PX_OUTPUT_ARCH) # platforms with fixed arch like ps4 dont need to have arch defined, then dont add bitness - SET(CMAKE_DEBUG_POSTFIX "_${LIBPATH_SUFFIX}") - SET(CMAKE_PROFILE_POSTFIX "_${LIBPATH_SUFFIX}") - SET(CMAKE_CHECKED_POSTFIX "_${LIBPATH_SUFFIX}") - SET(CMAKE_RELEASE_POSTFIX "_${LIBPATH_SUFFIX}") - ENDIF() -ENDIF() - -# Can no longer just use LIBPATH_SUFFIX since it depends on build type -IF(CMAKE_CL_64) - SET(RESOURCE_LIBPATH_SUFFIX "x64") -ELSE(CMAKE_CL_64) - SET(RESOURCE_LIBPATH_SUFFIX "x86") -ENDIF(CMAKE_CL_64) - - diff --git a/Externals/CMakeModules/SetOutputPaths.cmake b/Externals/CMakeModules/SetOutputPaths.cmake deleted file mode 100644 index db0be34..0000000 --- a/Externals/CMakeModules/SetOutputPaths.cmake +++ /dev/null @@ -1,94 +0,0 @@ -FUNCTION(SetOutputPaths - OUTPUT_EXE_DIR - OUTPUT_DLL_DIR - OUTPUT_LIB_DIR) - - SET(EXE_DIR ${OUTPUT_EXE_DIR}) - SET(DLL_DIR ${OUTPUT_DLL_DIR}) - SET(LIB_DIR ${OUTPUT_LIB_DIR}) - - # Override the default output directories for all configurations. - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${LIB_DIR}) - -ENDFUNCTION(SetOutputPaths) - -FUNCTION(SetExeOutputPath OUTPUT_EXE_DIR) - - SET(EXE_DIR ${OUTPUT_EXE_DIR}) - - # Override the default output directories for all configurations. - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXE_DIR} PARENT_SCOPE) - -ENDFUNCTION(SetExeOutputPath) - -FUNCTION(SetDllOutputPath OUTPUT_DLL_DIR) - - SET(DLL_DIR ${OUTPUT_DLL_DIR}) - - # Override the default output directories for all configurations. - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DLL_DIR} PARENT_SCOPE) - -ENDFUNCTION(SetDllOutputPath) - -FUNCTION(SetLibOutputPath OUTPUT_LIB_DIR) - - SET(LIB_DIR ${OUTPUT_LIB_DIR}) - - # Override the default output directories for all configurations. - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIB_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED ${LIB_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE ${LIB_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${LIB_DIR}) - -ENDFUNCTION(SetLibOutputPath) - -FUNCTION(SetSingleOutputPath OUTPUT_ALL_DIR) - - SET(EXE_DIR ${OUTPUT_ALL_DIR}) - SET(DLL_DIR ${OUTPUT_ALL_DIR}) - SET(LIB_DIR ${OUTPUT_ALL_DIR}) - - # Override the default output directories for all configurations. - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXE_DIR} PARENT_SCOPE) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DLL_DIR} PARENT_SCOPE) - SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIB_DIR} PARENT_SCOPE) - - SET(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${LIB_DIR}) - -ENDFUNCTION(SetSingleOutputPath) \ No newline at end of file diff --git a/Externals/CMakeModules/ios/ios.toolchain.cmake b/Externals/CMakeModules/ios/ios.toolchain.cmake deleted file mode 100644 index 1f6ed45..0000000 --- a/Externals/CMakeModules/ios/ios.toolchain.cmake +++ /dev/null @@ -1,334 +0,0 @@ -# This file is part of the ios-cmake project. It was retrieved from -# https://github.com/cristeab/ios-cmake.git, which is a fork of -# https://code.google.com/p/ios-cmake/. Which in turn is based off of -# the Platform/Darwin.cmake and Platform/UnixPaths.cmake files which -# are included with CMake 2.8.4 -# -# The ios-cmake project is licensed under the new BSD license. -# -# Copyright (c) 2014, Bogdan Cristea and LTE Engineering Software, -# Kitware, Inc., Insight Software Consortium. All rights reserved. -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# This file is based off of the Platform/Darwin.cmake and -# Platform/UnixPaths.cmake files which are included with CMake 2.8.4 -# It has been altered for iOS development. -# -# Updated by Alex Stewart (alexs.mac@gmail.com). -# The following variables control the behaviour of this toolchain: -# -# IOS_PLATFORM: OS (default) or SIMULATOR or SIMULATOR64 -# OS = Build for iPhoneOS. -# SIMULATOR = Build for x86 i386 iPhone Simulator. -# SIMULATOR64 = Build for x86 x86_64 iPhone Simulator. -# CMAKE_OSX_SYSROOT: Path to the iOS SDK to use. By default this is -# automatically determined from IOS_PLATFORM and xcodebuild, but -# can also be manually specified (although this should not be required). -# CMAKE_IOS_DEVELOPER_ROOT: Path to the Developer directory for the iOS platform -# being compiled for. By default this is automatically determined from -# CMAKE_OSX_SYSROOT, but can also be manually specified (although this should -# not be required). -# ENABLE_BITCODE: (true|false) Enables or disables bitcode support. Default true -# -# This toolchain defines the following variables for use externally: -# -# XCODE_VERSION: Version number (not including Build version) of Xcode detected. -# IOS_SDK_VERSION: Version of iOS SDK being used. -# CMAKE_OSX_ARCHITECTURES: Architectures being compiled for (generated from -# IOS_PLATFORM). -# -# This toolchain defines the following macros for use externally: -# -# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE XCODE_VARIANT) -# A convenience macro for setting xcode specific properties on targets. -# Available variants are: All, Release, RelWithDebInfo, Debug, MinSizeRel -# example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1" "all"). -# -# find_host_package (PROGRAM ARGS) -# A macro used to find executable programs on the host system, not within the -# iOS environment. Thanks to the android-cmake project for providing the -# command. - -# Fix for PThread library not in path -set(CMAKE_THREAD_LIBS_INIT "-lpthread") -set(CMAKE_HAVE_THREADS_LIBRARY 1) -set(CMAKE_USE_WIN32_THREADS_INIT 0) -set(CMAKE_USE_PTHREADS_INIT 1) - -# Get the Xcode version being used. -execute_process(COMMAND xcodebuild -version - OUTPUT_VARIABLE XCODE_VERSION - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) -string(REGEX MATCH "Xcode [0-9\\.]+" XCODE_VERSION "${XCODE_VERSION}") -string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" XCODE_VERSION "${XCODE_VERSION}") -message(STATUS "Building with Xcode version: ${XCODE_VERSION}") -# Default to building for iPhoneOS if not specified otherwise, and we cannot -# determine the platform from the CMAKE_OSX_ARCHITECTURES variable. The use -# of CMAKE_OSX_ARCHITECTURES is such that try_compile() projects can correctly -# determine the value of IOS_PLATFORM from the root project, as -# CMAKE_OSX_ARCHITECTURES is propagated to them by CMake. -if (NOT DEFINED IOS_PLATFORM) - if (CMAKE_OSX_ARCHITECTURES) - if (CMAKE_OSX_ARCHITECTURES MATCHES ".*arm.*") - set(IOS_PLATFORM "OS") - elseif (CMAKE_OSX_ARCHITECTURES MATCHES "i386") - set(IOS_PLATFORM "SIMULATOR") - elseif (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") - set(IOS_PLATFORM "SIMULATOR64") - endif() - endif() - if (NOT IOS_PLATFORM) - set(IOS_PLATFORM "OS") - endif() -endif() -set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING - "Type of iOS platform for which to build.") -# Determine the platform name and architectures for use in xcodebuild commands -# from the specified IOS_PLATFORM name. -if (IOS_PLATFORM STREQUAL "OS") - set(XCODE_IOS_PLATFORM iphoneos) - set(IOS_ARCH armv7 armv7s arm64) -elseif (IOS_PLATFORM STREQUAL "SIMULATOR") - set(XCODE_IOS_PLATFORM iphonesimulator) - set(IOS_ARCH i386) -elseif(IOS_PLATFORM STREQUAL "SIMULATOR64") - set(XCODE_IOS_PLATFORM iphonesimulator) - set(IOS_ARCH x86_64) -else() - message(FATAL_ERROR "Invalid IOS_PLATFORM: ${IOS_PLATFORM}") -endif() -message(STATUS "Configuring iOS build for platform: ${IOS_PLATFORM}, " - "architecture(s): ${IOS_ARCH}") -# If user did not specify the SDK root to use, then query xcodebuild for it. -if (NOT CMAKE_OSX_SYSROOT) - execute_process(COMMAND xcodebuild -version -sdk ${XCODE_IOS_PLATFORM} Path - OUTPUT_VARIABLE CMAKE_OSX_SYSROOT - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - message(STATUS "Using SDK: ${CMAKE_OSX_SYSROOT} for platform: ${IOS_PLATFORM}") -endif() -if (NOT EXISTS ${CMAKE_OSX_SYSROOT}) - message(FATAL_ERROR "Invalid CMAKE_OSX_SYSROOT: ${CMAKE_OSX_SYSROOT} " - "does not exist.") -endif() -# Specify minimum version of deployment target. -if (NOT DEFINED IOS_DEPLOYMENT_TARGET) - # Unless specified, SDK version 8.0 is used by default as minimum target version. - set(IOS_DEPLOYMENT_TARGET "8.0" - CACHE STRING "Minimum iOS version to build for." ) - message(STATUS "Using the default min-version since IOS_DEPLOYMENT_TARGET not provided!") -endif() -# Use bitcode or not -if (NOT DEFINED ENABLE_BITCODE) - # Unless specified, enable bitcode support by default - set(ENABLE_BITCODE FALSE CACHE BOOL "Wheter or not to enable bitcode") - message(STATUS "Disabling bitcode support by default. ENABLE_BITCODE not provided!") -endif() -# Get the SDK version information. -execute_process(COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version SDKVersion - OUTPUT_VARIABLE IOS_SDK_VERSION - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) -# Find the Developer root for the specific iOS platform being compiled for -# from CMAKE_OSX_SYSROOT. Should be ../../ from SDK specified in -# CMAKE_OSX_SYSROOT. There does not appear to be a direct way to obtain -# this information from xcrun or xcodebuild. -if (NOT CMAKE_IOS_DEVELOPER_ROOT) - get_filename_component(IOS_PLATFORM_SDK_DIR ${CMAKE_OSX_SYSROOT} PATH) - get_filename_component(CMAKE_IOS_DEVELOPER_ROOT ${IOS_PLATFORM_SDK_DIR} PATH) -endif() -if (NOT EXISTS ${CMAKE_IOS_DEVELOPER_ROOT}) - message(FATAL_ERROR "Invalid CMAKE_IOS_DEVELOPER_ROOT: " - "${CMAKE_IOS_DEVELOPER_ROOT} does not exist.") -endif() -message("CMAKE_IOS_DEVELOPER_ROOT: ${CMAKE_IOS_DEVELOPER_ROOT}") -# Find the C & C++ compilers for the specified SDK. -if (NOT CMAKE_C_COMPILER) - execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang - OUTPUT_VARIABLE CMAKE_C_COMPILER - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - message(STATUS "Using C compiler: ${CMAKE_C_COMPILER}") -endif() -if (NOT CMAKE_CXX_COMPILER) - execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang++ - OUTPUT_VARIABLE CMAKE_CXX_COMPILER - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - message(STATUS "Using CXX compiler: ${CMAKE_CXX_COMPILER}") -endif() -# Find (Apple's) libtool. -execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find libtool - OUTPUT_VARIABLE IOS_LIBTOOL - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) -message(STATUS "Using libtool: ${IOS_LIBTOOL}") -# Configure libtool to be used instead of ar + ranlib to build static libraries. -# This is required on Xcode 7+, but should also work on previous versions of -# Xcode. -set(CMAKE_C_CREATE_STATIC_LIBRARY - "${IOS_LIBTOOL} -static -o ") -set(CMAKE_CXX_CREATE_STATIC_LIBRARY - "${IOS_LIBTOOL} -static -o ") -# Get the version of Darwin (OS X) of the host. -execute_process(COMMAND uname -r - OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) -# Standard settings. -set(CMAKE_SYSTEM_NAME Darwin CACHE INTERNAL "") -set(CMAKE_SYSTEM_VERSION ${IOS_SDK_VERSION} CACHE INTERNAL "") -set(UNIX TRUE CACHE BOOL "") -set(APPLE TRUE CACHE BOOL "") -set(IOS TRUE CACHE BOOL "") -set(CMAKE_AR ar CACHE FILEPATH "" FORCE) -set(CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE) -# Force unset of OS X-specific deployment target (otherwise autopopulated), -# required as of cmake 2.8.10. -set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING - "Must be empty for iOS builds." FORCE) -# Set the architectures for which to build. -set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE STRING "Build architecture for iOS") -# Skip the platform compiler checks for cross compiling. -set(CMAKE_CXX_COMPILER_FORCED TRUE) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_C_COMPILER_FORCED TRUE) -set(CMAKE_C_COMPILER_WORKS TRUE) -# All iOS/Darwin specific settings - some may be redundant. -set(CMAKE_SHARED_LIBRARY_PREFIX "lib") -set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") -set(CMAKE_SHARED_MODULE_PREFIX "lib") -set(CMAKE_SHARED_MODULE_SUFFIX ".so") -set(CMAKE_MODULE_EXISTS 1) -set(CMAKE_DL_LIBS "") -set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") -set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ") -set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}") -set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") -message(STATUS "Building for minimum iOS version: ${IOS_DEPLOYMENT_TARGET}" - " (SDK version: ${IOS_SDK_VERSION})") -# Note that only Xcode 7+ supports the newer more specific: -# -m${XCODE_IOS_PLATFORM}-version-min flags, older versions of Xcode use: -# -m(ios/ios-simulator)-version-min instead. -if (IOS_PLATFORM STREQUAL "OS") - if (XCODE_VERSION VERSION_LESS 7.0) - set(XCODE_IOS_PLATFORM_VERSION_FLAGS - "-mios-version-min=${IOS_DEPLOYMENT_TARGET}") - else() - # Xcode 7.0+ uses flags we can build directly from XCODE_IOS_PLATFORM. - set(XCODE_IOS_PLATFORM_VERSION_FLAGS - "-m${XCODE_IOS_PLATFORM}-version-min=${IOS_DEPLOYMENT_TARGET}") - endif() -else() - # SIMULATOR or SIMULATOR64 both use -mios-simulator-version-min. - set(XCODE_IOS_PLATFORM_VERSION_FLAGS - "-mios-simulator-version-min=${IOS_DEPLOYMENT_TARGET}") -endif() -message(STATUS "Version flags set to: ${XCODE_IOS_PLATFORM_VERSION_FLAGS}") - -if (ENABLE_BITCODE) - set(BITCODE "-fembed-bitcode") - message(STATUS "Enabling bitcode support.") -else() - set(BITCODE "") - message(STATUS "Disabling bitcode support.") -endif() - -set(CMAKE_C_FLAGS -"${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fobjc-abi-version=2 -fobjc-arc ${CMAKE_C_FLAGS}") -# Hidden visibilty is required for C++ on iOS. -set(CMAKE_CXX_FLAGS - "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} ${CMAKE_CXX_FLAGS}") -set(CMAKE_CXX_FLAGS_RELEASE "${BITCODE} ${CMAKE_CXX_FLAGS_RELEASE}") -set(CMAKE_C_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}") -set(CMAKE_CXX_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}") -# In order to ensure that the updated compiler flags are used in try_compile() -# tests, we have to forcibly set them in the CMake cache, not merely set them -# in the local scope. -list(APPEND VARS_TO_FORCE_IN_CACHE - CMAKE_C_FLAGS - CMAKE_CXX_FLAGS - CMAKE_CXX_RELEASE - CMAKE_C_LINK_FLAGS - CMAKE_CXX_LINK_FLAGS) -foreach(VAR_TO_FORCE ${VARS_TO_FORCE_IN_CACHE}) - set(${VAR_TO_FORCE} "${${VAR_TO_FORCE}}" CACHE STRING "" FORCE) -endforeach() -set(CMAKE_PLATFORM_HAS_INSTALLNAME 1) -set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names") -set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") -set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") -set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") -set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -# Hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old -# build tree (where install_name_tool was hardcoded) and where -# CMAKE_INSTALL_NAME_TOOL isn't in the cache and still cmake didn't fail in -# CMakeFindBinUtils.cmake (because it isn't rerun) hardcode -# CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did -# before, Alex. -if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) - find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool) -endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) -# Set the find root to the iOS developer roots and to user defined paths. -set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_OSX_SYSROOT} - ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root" FORCE) -# Default to searching for frameworks first. -set(CMAKE_FIND_FRAMEWORK FIRST) -# Set up the default search directories for frameworks. -set(CMAKE_SYSTEM_FRAMEWORK_PATH - ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks - ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks - ${CMAKE_OSX_SYSROOT}/Developer/Library/Frameworks) -# Only search the specified iOS SDK, not the remainder of the host filesystem. -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -# This little macro lets you set any XCode specific property. -macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE XCODE_RELVERSION) - set(XCODE_RELVERSION_I "${XCODE_RELVERSION}") - if (XCODE_RELVERSION_I STREQUAL "All") - set_property(TARGET ${TARGET} PROPERTY - XCODE_ATTRIBUTE_${XCODE_PROPERTY} "${XCODE_VALUE}") - else() - set_property(TARGET ${TARGET} PROPERTY - XCODE_ATTRIBUTE_${XCODE_PROPERTY}[variant=${XCODE_RELVERSION_I}] "${XCODE_VALUE}") - endif() -endmacro(set_xcode_property) -# This macro lets you find executable programs on the host system. -macro(find_host_package) - set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) - set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) - set(IOS FALSE) - find_package(${ARGN}) - set(IOS TRUE) - set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -endmacro(find_host_package) diff --git a/NvCloth/BuildProjectsIOS.sh b/NvCloth/BuildProjectsIOS.sh index aa6bca2..5a686c0 100644 --- a/NvCloth/BuildProjectsIOS.sh +++ b/NvCloth/BuildProjectsIOS.sh @@ -2,11 +2,7 @@ # Make sure the various variables that we need are set -export GW_DEPS_ROOT="$PWD""/../../../../../" - -if [ -e $PWD"/../../Externals/CMakeModules" ]; then - export GW_DEPS_ROOT="$PWD""/../../" -fi +export GW_DEPS_ROOT="$PWD""/../" [ -z "$GW_DEPS_ROOT" ] && echo "GW_DEPS_ROOT not defined." && exit 1; diff --git a/NvCloth/BuildProjectsOsx.sh b/NvCloth/BuildProjectsOsx.sh index d0c6223..e25cffc 100644 --- a/NvCloth/BuildProjectsOsx.sh +++ b/NvCloth/BuildProjectsOsx.sh @@ -2,11 +2,7 @@ # Make sure the various variables that we need are set -export GW_DEPS_ROOT="$PWD""/../../../../../../" - -if [ -e $PWD"/../../Externals/CMakeModules" ]; then - export GW_DEPS_ROOT="$PWD""/../../" -fi +export GW_DEPS_ROOT="$PWD""/../" [ -z "$GW_DEPS_ROOT" ] && echo "GW_DEPS_ROOT not defined." && exit 1; @@ -21,10 +17,6 @@ export CMAKE="$PM_cmake_PATH/bin/cmake" # Build projects here -cd compiler/osx32-cmake/ -$CMAKE --build . --target ALL_BUILD --clean-first --config release -- -parallelizeTargets -jobs 5 || exit 1 -cd ../../ - cd compiler/osx64-cmake/ $CMAKE --build . --target ALL_BUILD --clean-first --config release -- -parallelizeTargets -jobs 5 || exit 1 cd ../../ diff --git a/NvCloth/CmakeGenerateAndroid.bat b/NvCloth/CmakeGenerateAndroid.bat index 38d255e..fc0a40d 100644 --- a/NvCloth/CmakeGenerateAndroid.bat +++ b/NvCloth/CmakeGenerateAndroid.bat @@ -2,18 +2,13 @@ set EXIT_CODE=0 REM Make sure the various variables that we need are set -CD /D %~dp0 -REM echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally." -call "./scripts/locate_gw_root.bat" GW_DEPS_ROOT_F -@echo on -set GW_DEPS_ROOT=%GW_DEPS_ROOT_F% +echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally." +REM single " is not a mistake +setx GW_DEPS_ROOT "%GW_DEPS_ROOT% +REM this one is for local use +set GW_DEPS_ROOT=%GW_DEPS_ROOT% echo GW_DEPS_ROOT = %GW_DEPS_ROOT% -@echo off -IF EXIST %~dp0..\Externals\CMakeModules ( - set GW_DEPS_ROOT=%~dp0..\ -) - IF NOT DEFINED GW_DEPS_ROOT GOTO GW_DEPS_ROOT_UNDEFINED set PX_OUTPUT_ROOT=%~dp0 @@ -86,7 +81,7 @@ REM Toolchain dependent cmd line params REM set CMAKE_TOOLCHAIN_PARAMS=-DCMAKE_TOOLCHAIN_FILE=C:\Users\lpanov\projects\nvidia\NvCloth\Externals\CMakeModules\Android\android.toolchain.cmake -DANDROID_NATIVE_API_LEVEL=android-%ANDROID_API% -DANDROID_ABI=%ANDROID_ABI% -DANDROID_STL="gnustl_static" -DTARGET_BUILD_PLATFORM=android set CMAKE_TOOLCHAIN_PARAMS=-DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_API_MIN=%ANDROID_API% -DCMAKE_ANDROID_API=%ANDROID_API% -cmake ..\cmake\android %CMAKE_COMPILER_PARAMS% %CMAKE_TOOLCHAIN_PARAMS% %CMAKE_COMMON_PARAMS% +%CMAKE% ..\cmake\android %CMAKE_COMPILER_PARAMS% %CMAKE_TOOLCHAIN_PARAMS% %CMAKE_COMMON_PARAMS% IF %ERRORLEVEL% NEQ 0 ( set EXIT_CODE=%ERRORLEVEL% GOTO :End diff --git a/NvCloth/CmakeGenerateProjects.bat b/NvCloth/CmakeGenerateProjects.bat index 6e0f7dc..5896f9a 100644 --- a/NvCloth/CmakeGenerateProjects.bat +++ b/NvCloth/CmakeGenerateProjects.bat @@ -4,22 +4,19 @@ set EXIT_CODE=0 REM Make sure the various variables that we need are set CD /D %~dp0 -echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally." -call "./scripts/locate_gw_root.bat" GW_DEPS_ROOT_F -REM single " is not a mistake -setx GW_DEPS_ROOT "%GW_DEPS_ROOT_F% -REM this one is for local use -set GW_DEPS_ROOT=%GW_DEPS_ROOT_F% -echo GW_DEPS_ROOT = %GW_DEPS_ROOT% REM Make sure the various variables that we need are set call "./scripts/locate_cuda.bat" CUDA_PATH_ echo CUDA_PATH_ = %CUDA_PATH_% -IF EXIST %~dp0..\Externals\CMakeModules ( - set GW_DEPS_ROOT=%~dp0..\ -) +set GW_DEPS_ROOT=%~dp0..\ +echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally." +REM single " is not a mistake +setx GW_DEPS_ROOT "%GW_DEPS_ROOT% +REM this one is for local use +set GW_DEPS_ROOT=%GW_DEPS_ROOT% +echo GW_DEPS_ROOT = %GW_DEPS_ROOT% IF NOT DEFINED GW_DEPS_ROOT goto GW_DEPS_ROOT_UNDEFINED @@ -70,12 +67,6 @@ pushd compiler\vc12win64-cmake\ %CMAKE% ..\cmake\windows -G "Visual Studio 12 2013" -Ax64 %CMAKE_COMMON_PARAMS% -DPX_OUTPUT_DLL_DIR=%PX_OUTPUT_ROOT%\bin\vc12win64-cmake -DPX_OUTPUT_LIB_DIR=%PX_OUTPUT_ROOT%\lib\vc12win64-cmake -DPX_OUTPUT_EXE_DIR=%PX_OUTPUT_ROOT%\bin\vc12win64-cmake popd -rmdir /s /q compiler\vc14win32-cmake\ -mkdir compiler\vc14win32-cmake\ -pushd compiler\vc14win32-cmake\ -%CMAKE% ..\cmake\windows -G "Visual Studio 14 2015" -AWin32 %CMAKE_COMMON_PARAMS% -DPX_OUTPUT_DLL_DIR=%PX_OUTPUT_ROOT%\bin\vc14win32-cmake -DPX_OUTPUT_LIB_DIR=%PX_OUTPUT_ROOT%\lib\vc14win32-cmake -DPX_OUTPUT_EXE_DIR=%PX_OUTPUT_ROOT%\bin\vc14win32-cmake -popd - rmdir /s /q compiler\vc14win64-cmake\ mkdir compiler\vc14win64-cmake\ pushd compiler\vc14win64-cmake\ diff --git a/NvCloth/Externals/CMakeModules/FindGoogleTest.cmake b/NvCloth/Externals/CMakeModules/FindGoogleTest.cmake new file mode 100644 index 0000000..df03868 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindGoogleTest.cmake @@ -0,0 +1,28 @@ +# - Try to find GoogleTest +# Once done this will define +# GOOGLETEST_FOUND - System has GoogleTest +# GOOGLETEST_INCLUDE_DIR - The GoogleTest include directory +# GOOGLETEST_SRC_DIR - The GoogleTest src directory + +FIND_PATH( GOOGLETEST_INCLUDE_DIR gtest/gtest.h + HINTS + ${GW_DEPS_ROOT}/GoogleTest + ${GW_DEPS_ROOT}/NvCloth/test/external/gtest-1.4.0 + ${GW_DEPS_ROOT}/sw/physx/externals/GoogleTest/gtest-1.4.0 + PATH_SUFFIXES include + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH) + +FIND_PATH( GOOGLETEST_SRC_DIR gtest.cpp + HINTS + ${GW_DEPS_ROOT}/GoogleTest + ${GW_DEPS_ROOT}/NvCloth/test/external/gtest-1.4.0 + ${GW_DEPS_ROOT}/sw/physx/externals/GoogleTest/gtest-1.4.0 + PATH_SUFFIXES src + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GoogleTest DEFAULT_MSG GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR) + +mark_as_advanced(GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR) diff --git a/NvCloth/Externals/CMakeModules/FindNvSimd.cmake b/NvCloth/Externals/CMakeModules/FindNvSimd.cmake new file mode 100644 index 0000000..02d152c --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindNvSimd.cmake @@ -0,0 +1,21 @@ +# - Try to find NvSimd +# Once done this will define +# NVSIMD_FOUND - System has NvSimd +# NVSIMD_INCLUDE_DIR - The NvSimd include directories + +# TODO: Support version +FIND_PATH( NVSIMD_INCLUDE_DIR include/NvSimd4f.h + HINTS + ${GW_DEPS_ROOT}/NvSimd + ${GW_DEPS_ROOT}/PxShared/NvSimd + ${GW_DEPS_ROOT}/PxShared/src/NvSimd + ${GW_DEPS_ROOT}/sw/devrel/GameWorks/Shared/NvSimd/${PACKAGE_FIND_VERSION}/trunk + ${GW_DEPS_ROOT}/sw/devrel/GameWorks/Shared/NvSimd/1.1/trunk + ) + +MESSAGE(${NVSIMD_INCLUDE_DIR}) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(NvSimd DEFAULT_MSG NVSIMD_INCLUDE_DIR) + +mark_as_advanced(NVSIMD_INCLUDE_DIR) diff --git a/NvCloth/Externals/CMakeModules/FindPhysX.cmake b/NvCloth/Externals/CMakeModules/FindPhysX.cmake new file mode 100644 index 0000000..5b07c14 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindPhysX.cmake @@ -0,0 +1,21 @@ +# +# Find PhysX +# +# This is a really dumb finder - it finds the PhysX install we're going to use add_subdirectory on. +# PHYSX_FOUND - System has PhysX +# PHYSX_ROOT_DIR - The PhysX root directory + +# First look for the feature branch, then for the trunk +FIND_PATH( PHYSX_ROOT_DIR Include/PxActor.h + HINTS + ${GW_DEPS_ROOT}/PhysXSDK + ${GW_DEPS_ROOT}/PhysX_3.4 + ${GW_DEPS_ROOT}/sw/physx/PhysXSDK/3.4/trunk + ) + +MESSAGE(${PHYSX_ROOT_DIR}) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysX DEFAULT_MSG PHYSX_ROOT_DIR) + +mark_as_advanced(PHYSX_ROOT_DIR) diff --git a/NvCloth/Externals/CMakeModules/FindPxShared.cmake b/NvCloth/Externals/CMakeModules/FindPxShared.cmake new file mode 100644 index 0000000..3297996 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindPxShared.cmake @@ -0,0 +1,17 @@ +# - Try to find PxShared +# Once done this will define +# PXSHARED_FOUND - System has PxShared +# PXSHARED_ROOT_DIR - The root of PxShared + +# NOTE: We're including a version in this, but the first hint is without one - we should use that! +FIND_PATH( PXSHARED_ROOT_DIR include/foundation/Px.h + HINTS + ${GW_DEPS_ROOT}/PxShared + ${GW_DEPS_ROOT}/sw/physx/PxShared/1.0/trunk + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxShared DEFAULT_MSG PXSHARED_ROOT_DIR) + +mark_as_advanced(PXSHARED_ROOT_DIR) diff --git a/NvCloth/Externals/CMakeModules/FindPxToolkit.cmake b/NvCloth/Externals/CMakeModules/FindPxToolkit.cmake new file mode 100644 index 0000000..583899b --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindPxToolkit.cmake @@ -0,0 +1,26 @@ +# - Try to find PXTOOLKIT +# Once done this will define +# PXTOOLKIT_FOUND - System has PXTOOLKIT +# PXTOOLKIT_ROOT - The PXTOOLKIT root directory +# PXTOOLKIT_INCLUDE_DIR - The PXTOOLKIT include directory +# PXTOOLKIT_SRC_DIR - The PXTOOLKIT src directory + +FIND_PATH( PXTOOLKIT_INCLUDE_DIR PxTkBmpLoader.h + HINTS + ${GW_DEPS_ROOT}/PxToolKit + ${GW_DEPS_ROOT}/PhysX_3.4/Samples/PxToolkit + ${GW_DEPS_ROOT}/sw/physx/PhysXSDK/3.4/trunk/Samples/PxToolkit + PATH_SUFFIXES include) + +FIND_PATH( PXTOOLKIT_SRC_DIR PxTkBmpLoader.cpp + HINTS + ${GW_DEPS_ROOT}/PxToolKit + ${GW_DEPS_ROOT}/PhysX_3.4/Samples/PxToolkit + ${GW_DEPS_ROOT}/sw/physx/PhysXSDK/3.4/trunk/Samples/PxToolkit + PATH_SUFFIXES src) + +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxToolKit DEFAULT_MSG PXTOOLKIT_INCLUDE_DIR PXTOOLKIT_SRC_DIR) + +mark_as_advanced(PXTOOLKIT_INCLUDE_DIR PXTOOLKIT_SRC_DIR) diff --git a/NvCloth/Externals/CMakeModules/FindTarga.cmake b/NvCloth/Externals/CMakeModules/FindTarga.cmake new file mode 100644 index 0000000..b042c96 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindTarga.cmake @@ -0,0 +1,23 @@ +# - Try to find Targa +# Once done this will define +# TARGA_FOUND - System has targa +# TARGA_INCLUDE_DIR - The targa include directory +# TARGA_SRC_DIR - The targa src directory + +FIND_PATH( TARGA_INCLUDE_DIR targa.h + HINTS + ${GW_DEPS_ROOT}/externals/targa/1 + ${GW_DEPS_ROOT}/sw/physx/externals/targa/1 + PATH_SUFFIXES include) + +FIND_PATH( TARGA_SRC_DIR targa.cpp + HINTS + ${GW_DEPS_ROOT}/externals/targa/1 + ${GW_DEPS_ROOT}/sw/physx/externals/targa/1 + PATH_SUFFIXES src) + +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Targa DEFAULT_MSG TARGA_INCLUDE_DIR TARGA_SRC_DIR) + +mark_as_advanced(TARGA_INCLUDE_DIR TARGA_SRC_DIR) \ No newline at end of file diff --git a/NvCloth/Externals/CMakeModules/FindnvToolsExt.cmake b/NvCloth/Externals/CMakeModules/FindnvToolsExt.cmake new file mode 100644 index 0000000..26c00dc --- /dev/null +++ b/NvCloth/Externals/CMakeModules/FindnvToolsExt.cmake @@ -0,0 +1,40 @@ +# - Try to find nvToolsExt +# Once done this will define +# NVTOOLSEXT_FOUND - System has nvToolsExt +# NVTOOLSEXT_INCLUDE_DIRS - The nvToolsExt include directories +# NVTOOLSEXT_LIBRARIES - The libraries needed to use nvToolsExt +# NVTOOLSEXT_DEFINITIONS - Compiler switches required for using nvToolsExt + +FIND_PATH( NVTOOLSEXT_INCLUDE_DIRS nvToolsExt.h + HINTS + ${GW_DEPS_ROOT}/nvToolsExt + ${GW_DEPS_ROOT}/Externals/nvToolsExt/1 + ${GW_DEPS_ROOT}/sw/physx/externals/nvToolsExt/1 + PATH_SUFFIXES include) + +INCLUDE(FindPackageHandleStandardArgs) + +IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") + # NOTE: Doesn't make sense for all platforms - ARM + IF(CMAKE_CL_64) + SET(NVTOOLSEXT_LIBNAME "nvToolsExt64_1") + SET(NVTOOLSEXT_LIBPATH_SUFFIX "x64") + ELSE(CMAKE_CL_64) + SET(NVTOOLSEXT_LIBNAME nvToolsExt32_1) + SET(NVTOOLSEXT_LIBPATH_SUFFIX "Win32") + ENDIF(CMAKE_CL_64) + + + FIND_LIBRARY( NVTOOLSEXT_LIBRARIES ${NVTOOLSEXT_LIBNAME} + ${GW_DEPS_ROOT}/nvToolsExt + ${GW_DEPS_ROOT}/Externals/nvToolsExt/1/lib/${NVTOOLSEXT_LIBPATH_SUFFIX} + ${GW_DEPS_ROOT}/sw/physx/externals/nvToolsExt/1/lib/${NVTOOLSEXT_LIBPATH_SUFFIX} + ) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS(nvToolsExt DEFAULT_MSG NVTOOLSEXT_LIBRARIES NVTOOLSEXT_INCLUDE_DIRS) +ELSE() + # Exclude the libraries for non-windows platforms + FIND_PACKAGE_HANDLE_STANDARD_ARGS(nvToolsExt DEFAULT_MSG NVTOOLSEXT_INCLUDE_DIRS) +ENDIF() + +mark_as_advanced(NVTOOLSEXT_INCLUDE_DIRS NVTOOLSEXT_LIBRARIES) \ No newline at end of file diff --git a/NvCloth/Externals/CMakeModules/NvidiaBuildOptions.cmake b/NvCloth/Externals/CMakeModules/NvidiaBuildOptions.cmake new file mode 100644 index 0000000..e5d89af --- /dev/null +++ b/NvCloth/Externals/CMakeModules/NvidiaBuildOptions.cmake @@ -0,0 +1,180 @@ +# Define the options up front + +OPTION(APPEND_CONFIG_NAME "Append config (DEBUG, CHECKED, PROFILE or '' for release) to outputted binaries." OFF) +OPTION(USE_GAMEWORKS_OUTPUT_DIRS "Use new GameWorks folder structure for binary output." ON) +OPTION(USE_STATIC_WINCRT "Use the statically linked windows CRT" OFF) +OPTION(USE_DEBUG_WINCRT "Use the debug version of the CRT" OFF) +OPTION(GENERATE_STATIC_LIBRARIES "Generate static libraries" OFF) + +INCLUDE(SetOutputPaths) + + # Set the WINCRT_DEBUG and WINCRT_NDEBUG variables for use in project compile settings + # Really only relevant to windows + + SET(DISABLE_ITERATOR_DEBUGGING "/D \"_HAS_ITERATOR_DEBUGGING=0\" /D \"_ITERATOR_DEBUG_LEVEL=0\"") + SET(DISABLE_ITERATOR_DEBUGGING_CUDA "-D_HAS_ITERATOR_DEBUGGING=0 -D_ITERATOR_DEBUG_LEVEL=0") + SET(CRT_DEBUG_FLAG "/D \"_DEBUG\"") + SET(CRT_NDEBUG_FLAG "/D \"NDEBUG\"") + + # Need a different format for CUDA + SET(CUDA_DEBUG_FLAG "-DNDEBUG ${DISABLE_ITERATOR_DEBUGGING_CUDA}") + SET(CUDA_NDEBUG_FLAG "-DNDEBUG") + + SET(CUDA_CRT_COMPILE_OPTIONS_NDEBUG "") + SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "") + + + IF(USE_STATIC_WINCRT) + SET(WINCRT_NDEBUG "/MT ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") + SET(CUDA_CRT_COMPILE_OPTIONS_NDEBUG "/MT") + + IF (USE_DEBUG_WINCRT) + SET(CUDA_DEBUG_FLAG "-D_DEBUG") + SET(WINCRT_DEBUG "/MTd ${CRT_DEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") + SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MTd") + ELSE() + SET(WINCRT_DEBUG "/MT ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") + SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MT") + ENDIF() + ELSE() + SET(WINCRT_NDEBUG "/MD ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}") + SET(CUDA_CRT_COMPILE_OPTIONS_NDEBUG "/MD") + + IF(USE_DEBUG_WINCRT) + SET(CUDA_DEBUG_FLAG "-D_DEBUG") + SET(WINCRT_DEBUG "/MDd ${CRT_DEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") + SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MDd") + ELSE() + SET(WINCRT_DEBUG "/MD ${DISABLE_ITERATOR_DEBUGGING} ${CRT_NDEBUG_FLAG}" CACHE INTERNAL "Windows CRT build setting") + SET(CUDA_CRT_COMPILE_OPTIONS_DEBUG "/MD") + ENDIF() + ENDIF() + + +IF(USE_GAMEWORKS_OUTPUT_DIRS) + + # New bitness suffix + IF(CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(LIBPATH_SUFFIX "64") + # Set default exe suffix. Unset on platforms that don't need it. Include underscore since it's optional + SET(EXE_SUFFIX "_64") + ELSE() + SET(LIBPATH_SUFFIX "32") + # Set default exe suffix. Unset on platforms that don't need it. Include underscore since it's optional + SET(EXE_SUFFIX "_32") + ENDIF() + + IF (NOT DEFINED PX_OUTPUT_LIB_DIR) + MESSAGE(FATAL_ERROR "When using the GameWorks output structure you must specify PX_OUTPUT_LIB_DIR as the base") + ENDIF() + + IF (NOT DEFINED PX_OUTPUT_BIN_DIR) + MESSAGE(FATAL_ERROR "When using the GameWorks output structure you must specify PX_OUTPUT_BIN_DIR as the base") + ENDIF() + + + INCLUDE(GetCompilerAndPlatform) + # Get the compiler and platform string into COMPILER_AND_PLATFORM + GetCompilerAndPlatform(COMPILER_AND_PLATFORM) + + GetStaticCRTString(CRT_STRING) + + IF(NOT CRT_STRING) # Non windows returns empty string + IF (NOT DEFINED PX_OUTPUT_ARCH) # platforms with fixed arch like ps4 dont need to have arch defined + # Set the path the DLLs and static libs go to + SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}" CACHE INTERNAL "Relative root of the lib output directory") + SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}" CACHE INTERNAL "Relative root dir of the exe output directory") + + # If there's no arch, then no bitness either. + + SET(EXE_SUFFIX "") + ELSE() + # Set the path the DLLs and static libs go to + SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}" CACHE INTERNAL "Relative root of the lib output directory") + SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}" CACHE INTERNAL "Relative root dir of the exe output directory") + ENDIF() + ELSE() + # Set the path the DLLs and static libs go to + SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}/${CRT_STRING}" CACHE INTERNAL "Relative root of the lib output directory") + SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}/${PX_OUTPUT_ARCH}/${CRT_STRING}" CACHE INTERNAL "Relative root dir of the exe output directory") + ENDIF() + + # Override our normal PX_ROOT_LIB_DIR for Android + IF(TARGET_BUILD_PLATFORM STREQUAL "Android") + SET(PX_ROOT_LIB_DIR "bin/${COMPILER_AND_PLATFORM}/${ANDROID_ABI}/${CM_ANDROID_FP}" CACHE INTERNAL "Relative root of the lib output directory") + ENDIF() + + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/debug" ) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/profile" ) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/checked" ) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/release" ) + + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/debug" ) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/profile" ) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/checked" ) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${PX_OUTPUT_LIB_DIR}/${PX_ROOT_LIB_DIR}/release" ) + + # Set the RUNTIME output directories - this is executables, etc. + # Override our normal PX_ROOT_EXE_DIR for Android + IF(TARGET_BUILD_PLATFORM STREQUAL "Android") + SET(PX_ROOT_EXE_DIR "bin/${COMPILER_AND_PLATFORM}/${ANDROID_ABI}/${CM_ANDROID_FP}" CACHE INTERNAL "Relative root dir of the exe output directory") + ENDIF() + + # RFC 108, we're doing EXEs as the special case since there will be presumable be less of those. + SET(PX_EXE_OUTPUT_DIRECTORY_DEBUG "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/debug" CACHE INTERNAL "Directory to put debug exes in") + SET(PX_EXE_OUTPUT_DIRECTORY_PROFILE "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/profile" CACHE INTERNAL "Directory to put profile exes in") + SET(PX_EXE_OUTPUT_DIRECTORY_CHECKED "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/checked" CACHE INTERNAL "Directory to put checked exes in") + SET(PX_EXE_OUTPUT_DIRECTORY_RELEASE "${PX_OUTPUT_BIN_DIR}/${PX_ROOT_EXE_DIR}/release" CACHE INTERNAL "Directory to put release exes in") + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} ) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE} ) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED} ) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} ) + + +ELSE() + # old bitness suffix + IF(CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(LIBPATH_SUFFIX "x64") + ELSE() + SET(LIBPATH_SUFFIX "x86") + ENDIF() + + + IF(DEFINED PX_OUTPUT_EXE_DIR) + SetExeOutputPath(${PX_OUTPUT_EXE_DIR}) + ENDIF() + IF(DEFINED PX_OUTPUT_DLL_DIR) + SetDllOutputPath(${PX_OUTPUT_DLL_DIR}) + ENDIF() + IF(DEFINED PX_OUTPUT_LIB_DIR) + SetLibOutputPath(${PX_OUTPUT_LIB_DIR}) + ENDIF() + # All EXE/DLL/LIB output will be overwritten if PX_OUTPUT_ALL_DIR is defined + IF(DEFINED PX_OUTPUT_ALL_DIR) + SetSingleOutputPath(${PX_OUTPUT_ALL_DIR}) + ENDIF() +ENDIF() + +IF(APPEND_CONFIG_NAME) + SET(CMAKE_DEBUG_POSTFIX "DEBUG_${LIBPATH_SUFFIX}") + SET(CMAKE_PROFILE_POSTFIX "PROFILE_${LIBPATH_SUFFIX}") + SET(CMAKE_CHECKED_POSTFIX "CHECKED_${LIBPATH_SUFFIX}") + SET(CMAKE_RELEASE_POSTFIX "_${LIBPATH_SUFFIX}") +ELSE() + IF (DEFINED PX_OUTPUT_ARCH) # platforms with fixed arch like ps4 dont need to have arch defined, then dont add bitness + SET(CMAKE_DEBUG_POSTFIX "_${LIBPATH_SUFFIX}") + SET(CMAKE_PROFILE_POSTFIX "_${LIBPATH_SUFFIX}") + SET(CMAKE_CHECKED_POSTFIX "_${LIBPATH_SUFFIX}") + SET(CMAKE_RELEASE_POSTFIX "_${LIBPATH_SUFFIX}") + ENDIF() +ENDIF() + +# Can no longer just use LIBPATH_SUFFIX since it depends on build type +IF(CMAKE_CL_64) + SET(RESOURCE_LIBPATH_SUFFIX "x64") +ELSE(CMAKE_CL_64) + SET(RESOURCE_LIBPATH_SUFFIX "x86") +ENDIF(CMAKE_CL_64) + + diff --git a/NvCloth/Externals/CMakeModules/SetOutputPaths.cmake b/NvCloth/Externals/CMakeModules/SetOutputPaths.cmake new file mode 100644 index 0000000..db0be34 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/SetOutputPaths.cmake @@ -0,0 +1,94 @@ +FUNCTION(SetOutputPaths + OUTPUT_EXE_DIR + OUTPUT_DLL_DIR + OUTPUT_LIB_DIR) + + SET(EXE_DIR ${OUTPUT_EXE_DIR}) + SET(DLL_DIR ${OUTPUT_DLL_DIR}) + SET(LIB_DIR ${OUTPUT_LIB_DIR}) + + # Override the default output directories for all configurations. + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${LIB_DIR}) + +ENDFUNCTION(SetOutputPaths) + +FUNCTION(SetExeOutputPath OUTPUT_EXE_DIR) + + SET(EXE_DIR ${OUTPUT_EXE_DIR}) + + # Override the default output directories for all configurations. + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXE_DIR} PARENT_SCOPE) + +ENDFUNCTION(SetExeOutputPath) + +FUNCTION(SetDllOutputPath OUTPUT_DLL_DIR) + + SET(DLL_DIR ${OUTPUT_DLL_DIR}) + + # Override the default output directories for all configurations. + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DLL_DIR} PARENT_SCOPE) + +ENDFUNCTION(SetDllOutputPath) + +FUNCTION(SetLibOutputPath OUTPUT_LIB_DIR) + + SET(LIB_DIR ${OUTPUT_LIB_DIR}) + + # Override the default output directories for all configurations. + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIB_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED ${LIB_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE ${LIB_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${LIB_DIR}) + +ENDFUNCTION(SetLibOutputPath) + +FUNCTION(SetSingleOutputPath OUTPUT_ALL_DIR) + + SET(EXE_DIR ${OUTPUT_ALL_DIR}) + SET(DLL_DIR ${OUTPUT_ALL_DIR}) + SET(LIB_DIR ${OUTPUT_ALL_DIR}) + + # Override the default output directories for all configurations. + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_CHECKED ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_CHECKED ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CHECKED ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXE_DIR} PARENT_SCOPE) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DLL_DIR} PARENT_SCOPE) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${LIB_DIR} PARENT_SCOPE) + + SET(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${LIB_DIR}) + +ENDFUNCTION(SetSingleOutputPath) \ No newline at end of file diff --git a/NvCloth/Externals/CMakeModules/android/AndroidCMake.tps b/NvCloth/Externals/CMakeModules/android/AndroidCMake.tps new file mode 100644 index 0000000..6ca944a --- /dev/null +++ b/NvCloth/Externals/CMakeModules/android/AndroidCMake.tps @@ -0,0 +1,17 @@ + + + + /Engine/Source/Runtime/Navmesh/RecastDemo/Bin/DroidSans.ttf + + + + + + + false + false + +Redirect: ../../../../HarfBuzz/harfbuzz-1.2.4/BuildForUE/Android/AndroidCMake.tps + + + \ No newline at end of file diff --git a/NvCloth/Externals/CMakeModules/android/AndroidNdkGdb.cmake b/NvCloth/Externals/CMakeModules/android/AndroidNdkGdb.cmake new file mode 100644 index 0000000..0677dcd --- /dev/null +++ b/NvCloth/Externals/CMakeModules/android/AndroidNdkGdb.cmake @@ -0,0 +1,96 @@ +# Copyright (c) 2014, Pavel Rojtberg +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +# ------------------------------------------------------------------------------ +# Usage: +# 1. place AndroidNdkGdb.cmake somewhere inside ${CMAKE_MODULE_PATH} +# 2. inside your project add +# +# include(AndroidNdkGdb) +# android_ndk_gdb_enable() +# # for each target +# add_library(MyLibrary ...) +# android_ndk_gdb_debuggable(MyLibrary) + + +# add gdbserver and general gdb configuration to project +# also create a mininal NDK skeleton so ndk-gdb finds the paths +# +# the optional parameter defines the path to the android project. +# uses PROJECT_SOURCE_DIR by default. +macro(android_ndk_gdb_enable) + if(ANDROID) + # create custom target that depends on the real target so it gets executed afterwards + add_custom_target(NDK_GDB ALL) + + if(${ARGC}) + set(ANDROID_PROJECT_DIR ${ARGV0}) + else() + set(ANDROID_PROJECT_DIR ${PROJECT_SOURCE_DIR}) + endif() + + set(NDK_GDB_SOLIB_PATH ${ANDROID_PROJECT_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}/) + file(MAKE_DIRECTORY ${NDK_GDB_SOLIB_PATH}) + + # 1. generate essential Android Makefiles + file(MAKE_DIRECTORY ${ANDROID_PROJECT_DIR}/jni) + if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Android.mk) + file(WRITE ${ANDROID_PROJECT_DIR}/jni/Android.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n") + endif() + if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Application.mk) + file(WRITE ${ANDROID_PROJECT_DIR}/jni/Application.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n") + endif() + + # 2. generate gdb.setup + get_directory_property(PROJECT_INCLUDES DIRECTORY ${PROJECT_SOURCE_DIR} INCLUDE_DIRECTORIES) + string(REGEX REPLACE ";" " " PROJECT_INCLUDES "${PROJECT_INCLUDES}") + file(WRITE ${LIBRARY_OUTPUT_PATH}/gdb.setup "set solib-search-path ${NDK_GDB_SOLIB_PATH}\n") + file(APPEND ${LIBRARY_OUTPUT_PATH}/gdb.setup "directory ${PROJECT_INCLUDES}\n") + + # 3. copy gdbserver executable + file(COPY ${ANDROID_NDK}/prebuilt/android-${ANDROID_ARCH_NAME}/gdbserver/gdbserver DESTINATION ${LIBRARY_OUTPUT_PATH}) + endif() +endmacro() + +# register a target for remote debugging +# copies the debug version to NDK_GDB_SOLIB_PATH then strips symbols of original +macro(android_ndk_gdb_debuggable TARGET_NAME) + if(ANDROID) + get_property(TARGET_LOCATION TARGET ${TARGET_NAME} PROPERTY LOCATION) + + # create custom target that depends on the real target so it gets executed afterwards + add_dependencies(NDK_GDB ${TARGET_NAME}) + + # 4. copy lib to obj + add_custom_command(TARGET NDK_GDB POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TARGET_LOCATION} ${NDK_GDB_SOLIB_PATH}) + + # 5. strip symbols + add_custom_command(TARGET NDK_GDB POST_BUILD COMMAND ${CMAKE_STRIP} ${TARGET_LOCATION}) + endif() +endmacro() diff --git a/NvCloth/Externals/CMakeModules/android/AndroidNdkModules.cmake b/NvCloth/Externals/CMakeModules/android/AndroidNdkModules.cmake new file mode 100644 index 0000000..64f37fd --- /dev/null +++ b/NvCloth/Externals/CMakeModules/android/AndroidNdkModules.cmake @@ -0,0 +1,58 @@ +# Copyright (c) 2014, Pavel Rojtberg +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +macro(android_ndk_import_module_cpufeatures) + if(ANDROID) + include_directories(${ANDROID_NDK}/sources/android/cpufeatures) + add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c) + target_link_libraries(cpufeatures dl) + endif() +endmacro() + +macro(android_ndk_import_module_native_app_glue) + if(ANDROID) + include_directories(${ANDROID_NDK}/sources/android/native_app_glue) + add_library(native_app_glue ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c) + target_link_libraries(native_app_glue log) + endif() +endmacro() + +macro(android_ndk_import_module_ndk_helper) + if(ANDROID) + android_ndk_import_module_cpufeatures() + android_ndk_import_module_native_app_glue() + + include_directories(${ANDROID_NDK}/sources/android/ndk_helper) + file(GLOB _NDK_HELPER_SRCS ${ANDROID_NDK}/sources/android/ndk_helper/*.cpp ${ANDROID_NDK}/sources/android/ndk_helper/gl3stub.c) + add_library(ndk_helper ${_NDK_HELPER_SRCS}) + target_link_libraries(ndk_helper log android EGL GLESv2 cpufeatures native_app_glue) + + unset(_NDK_HELPER_SRCS) + endif() +endmacro() \ No newline at end of file diff --git a/NvCloth/Externals/CMakeModules/android/README.md b/NvCloth/Externals/CMakeModules/android/README.md new file mode 100644 index 0000000..ee63021 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/android/README.md @@ -0,0 +1,240 @@ +# android-cmake + +CMake is great, and so is Android. This is a collection of CMake scripts that may be useful to the Android NDK community. It is based on experience from porting OpenCV library to Android: http://opencv.org/platforms/android.html + +Main goal is to share these scripts so that devs that use CMake as their build system may easily compile native code for Android. + +## TL;DR + + cmake -DCMAKE_TOOLCHAIN_FILE=android.toolchain.cmake \ + -DANDROID_NDK= \ + -DCMAKE_BUILD_TYPE=Release \ + -DANDROID_ABI="armeabi-v7a with NEON" \ + + cmake --build . + +One-liner: + + cmake -DCMAKE_TOOLCHAIN_FILE=android.toolchain.cmake -DANDROID_NDK= -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="armeabi-v7a with NEON" && cmake --build . + +_android-cmake_ will search for your NDK install in the following order: + +1. Value of `ANDROID_NDK` CMake variable; +1. Value of `ANDROID_NDK` environment variable; +1. Search under paths from `ANDROID_NDK_SEARCH_PATHS` CMake variable; +1. Search platform specific locations (home folder, Windows "Program Files", etc). + +So if you have installed the NDK as `~/android-ndk-r10d` then _android-cmake_ will locate it automatically. + +## Getting started + +To build a cmake-based C/C++ project for Android you need: + +* Android NDK (>= r5) http://developer.android.com/tools/sdk/ndk/index.html +* CMake (>= v2.6.3, >= v2.8.9 recommended) http://www.cmake.org/download + +The _android-cmake_ is also capable to build with NDK from AOSP or Linaro Android source tree, but you may be required to manually specify path to `libm` binary to link with. + +## Difference from traditional CMake + +Folowing the _ndk-build_ the _android-cmake_ supports **only two build targets**: + +* `-DCMAKE_BUILD_TYPE=Release` +* `-DCMAKE_BUILD_TYPE=Debug` + +So don't even try other targets that can be found in CMake documentation and don't forget to explicitly specify `Release` or `Debug` because CMake builds without a build configuration by default. + +## Difference from _ndk-build_ + +* Latest GCC available in NDK is used as the default compiler; +* `Release` builds with `-O3` instead of `-Os`; +* `Release` builds without debug info (without `-g`) (because _ndk-build_ always creates a stripped version but cmake delays this for `install/strip` target); +* `-fsigned-char` is added to compiler flags to make `char` signed by default as it is on x86/x86_64; +* GCC's stack protector is not used neither in `Debug` nor `Release` configurations; +* No builds for multiple platforms (e.g. building for both arm and x86 require to run cmake twice with different parameters); +* No file level Neon via `.neon` suffix; + +The following features of _ndk-build_ are not supported by the _android-cmake_ yet: + +* `armeabi-v7a-hard` ABI +* `libc++_static`/`libc++_shared` STL runtime + +## Basic options + +Similarly to the NDK build system _android-cmake_ allows to select between several compiler toolchains and target platforms. Most of the options can be set either as cmake arguments: `-D=` or as environment variables: + +* **ANDROID_NDK** - path to the Android NDK. If not set then _android-cmake_ will search for the most recent version of supported NDK in commonly used locations; +* **ANDROID_ABI** - specifies the target Application Binary Interface (ABI). This option nearly matches to the APP_ABI variable used by ndk-build tool from Android NDK. If not specified then set to `armeabi-v7a`. Possible target names are: + * `armeabi` - ARMv5TE based CPU with software floating point operations; + * **`armeabi-v7a`** - ARMv7 based devices with hardware FPU instructions (VFPv3_D16); + * `armeabi-v7a with NEON` - same as armeabi-v7a, but sets NEON as floating-point unit; + * `armeabi-v7a with VFPV3` - same as armeabi-v7a, but sets VFPv3_D32 as floating-point unit; + * `armeabi-v6 with VFP` - tuned for ARMv6 processors having VFP; + * `x86` - IA-32 instruction set + * `mips` - MIPS32 instruction set + * `arm64-v8a` - ARMv8 AArch64 instruction set - only for NDK r10 and newer + * `x86_64` - Intel64 instruction set (r1) - only for NDK r10 and newer + * `mips64` - MIPS64 instruction set (r6) - only for NDK r10 and newer +* **ANDROID_NATIVE_API_LEVEL** - level of android API to build for. Can be set either to full name (example: `android-8`) or a numeric value (example: `17`). The default API level depends on the target ABI: + * `android-8` for ARM; + * `android-9` for x86 and MIPS; + * `android-21` for 64-bit ABIs. + + Building for `android-L` is possible only when it is explicitly selected. +* **ANDROID_TOOLCHAIN_NAME** - the name of compiler toolchain to be used. This option allows to select between different GCC and Clang versions. The list of possible values depends on the NDK version and will be printed by toolchain file if an invalid value is set. By default _android-cmake_ selects the most recent version of GCC which can build for specified `ANDROID_ABI`. + + Example values are: + * `aarch64-linux-android-4.9` + * `aarch64-linux-android-clang3.5` + * `arm-linux-androideabi-4.8` + * `arm-linux-androideabi-4.9` + * `arm-linux-androideabi-clang3.5` + * `mips64el-linux-android-4.9` + * `mipsel-linux-android-4.8` + * `x86-4.9` + * `x86_64-4.9` + * etc. +* **ANDROID_STL** - the name of C++ runtime to use. The default is `gnustl_static`. + * `none` - do not configure the runtime. + * `system` - use the default minimal system C++ runtime library. + * Implies `-fno-rtti -fno-exceptions`. + * `system_re` - use the default minimal system C++ runtime library. + * Implies `-frtti -fexceptions`. + * `gabi++_static` - use the GAbi++ runtime as a static library. + * Implies `-frtti -fno-exceptions`. + * Available for NDK r7 and newer. + * `gabi++_shared` - use the GAbi++ runtime as a shared library. + * Implies `-frtti -fno-exceptions`. + * Available for NDK r7 and newer. + * `stlport_static` - use the STLport runtime as a static library. + * Implies `-fno-rtti -fno-exceptions` for NDK before r7. + * Implies `-frtti -fno-exceptions` for NDK r7 and newer. + * `stlport_shared` - use the STLport runtime as a shared library. + * Implies `-fno-rtti -fno-exceptions` for NDK before r7. + * Implies `-frtti -fno-exceptions` for NDK r7 and newer. + * **`gnustl_static`** - use the GNU STL as a static library. + * Implies `-frtti -fexceptions`. + * `gnustl_shared` - use the GNU STL as a shared library. + * Implies `-frtti -fno-exceptions`. + * Available for NDK r7b and newer. + * Silently degrades to `gnustl_static` if not available. +* **NDK_CCACHE** - path to `ccache` executable. If not set then initialized from `NDK_CCACHE` environment variable. + +## Advanced _android-cmake_ options + +Normally _android-cmake_ users are not supposed to touch these variables but they might be useful to workaround some build issues: + +* **ANDROID_FORCE_ARM_BUILD** = `OFF` - generate 32-bit ARM instructions instead of Thumb. Applicable only for arm ABIs and is forced to be `ON` for `armeabi-v6 with VFP`; +* **ANDROID_NO_UNDEFINED** = `ON` - show all undefined symbols as linker errors; +* **ANDROID_SO_UNDEFINED** = `OFF` - allow undefined symbols in shared libraries; + * actually it is turned `ON` by default for NDK older than `r7` +* **ANDROID_STL_FORCE_FEATURES** = `ON` - automatically configure rtti and exceptions support based on C++ runtime; +* **ANDROID_NDK_LAYOUT** = `RELEASE` - inner layout of Android NDK, should be detected automatically. Possible values are: + * `RELEASE` - public releases from Google; + * `LINARO` - NDK from Linaro project; + * `ANDROID` - NDK from AOSP. +* **ANDROID_FUNCTION_LEVEL_LINKING** = `ON` - enables saparate putting each function and data items into separate sections and enable garbage collection of unused input sections at link time (`-fdata-sections -ffunction-sections -Wl,--gc-sections`); +* **ANDROID_GOLD_LINKER** = `ON` - use gold linker with GCC 4.6 for NDK r8b and newer (only for ARM and x86); +* **ANDROID_NOEXECSTACK** = `ON` - enables or disables stack execution protection code (`-Wl,-z,noexecstack`); +* **ANDROID_RELRO** = `ON` - Enables RELRO - a memory corruption mitigation technique (`-Wl,-z,relro -Wl,-z,now`); +* **ANDROID_LIBM_PATH** - path to `libm.so` (set to something like `$(TOP)/out/target/product//obj/lib/libm.so`) to workaround unresolved `sincos`. + +## Fine-tuning `CMakeLists.txt` for _android-cmake_ + +### Recognizing Android build + +_android-cmake_ defines `ANDROID` CMake variable which can be used to add Android-specific stuff: + + if (ANDROID) + message(STATUS "Hello from Android build!") + endif() + +The recommended way to identify ARM/MIPS/x86 architecture is examining `CMAKE_SYSTEM_PROCESSOR` which is set to the appropriate value: + +* `armv5te` - for `armeabi` ABI +* `armv6` - for `armeabi-v6 with VFP` ABI +* `armv7-a` - for `armeabi-v7a`, `armeabi-v7a with VFPV3` and `armeabi-v7a with NEON` ABIs +* `aarch64` - for `arm64-v8a` ABI +* `i686` - for `x86` ABI +* `x86_64` - for `x86_64` ABI +* `mips` - for `mips` ABI +* `mips64` - for `mips64` ABI + +Other variables that are set by _android-cmake_ and can be used for the fine-grained build configuration are: + +* `NEON` - set if target ABI supports Neon; +* `ANDROID_NATIVE_API_LEVEL` - native Android API level we are building for (note: Java part of Andoid application can be built for another API level) +* `ANDROID_NDK_RELEASE` - version of the Android NDK +* `ANDROID_NDK_HOST_SYSTEM_NAME` - "windows", "linux-x86" or "darwin-x86" depending on the host platform +* `ANDROID_RTTI` - set if rtti is enabled by the runtime +* `ANDROID_EXCEPTIONS` - set if exceptions are enabled by the runtime + +### Finding packages + +When crosscompiling CMake `find_*` commands are normally expected to find libraries and packages belonging to the same build target. So _android-cmake_ configures CMake to search in Android-specific paths only and ignore your host system locations. So + + find_package(ZLIB) + +will surely find libz.so within the Android NDK. + +However sometimes you need to locate a host package even when cross-compiling. For example you can be searching for your documentation generator. The _android-cmake_ recommends you to use `find_host_package` and `find_host_program` macro defined in the `android.toolchain.cmake`: + + find_host_package(Doxygen) + find_host_program(PDFLATEX pdflatex) + +However this will break regular builds so instead of wrapping package search into platform-specific logic you can copy the following snippet into your project (put it after your top-level `project()` command): + + # Search packages for host system instead of packages for target system + # in case of cross compilation these macro should be defined by toolchain file + if(NOT COMMAND find_host_package) + macro(find_host_package) + find_package(${ARGN}) + endmacro() + endif() + if(NOT COMMAND find_host_program) + macro(find_host_program) + find_program(${ARGN}) + endmacro() + endif() + +### Compiler flags recycling + +Make sure to do the following in your scripts: + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}") + +The flags will be prepopulated with critical flags, so don't loose them. Also be aware that _android-cmake_ also sets configuration-specific compiler and linker flags. + +## Troubleshooting + +### Building on Windows + +First of all `cygwin` builds are **NOT supported** and will not be supported by _android-cmake_. To build natively on Windows you need a port of make but I recommend http://martine.github.io/ninja/ instead. + +To build with Ninja you need: + +* Ensure you are using CMake newer than 2.8.9; +* Download the latest Ninja from https://github.com/martine/ninja/releases; +* Put the `ninja.exe` into your PATH (or add path to `ninja.exe` to your PATH environment variable); +* Pass `-GNinja` to `cmake` alongside with other arguments (or choose Ninja generator in `cmake-gui`). +* Enjoy the fast native multithreaded build :) + +But if you still want to stick to old make then: + +* Get a Windows port of GNU Make: + * Android NDK r7 (and newer) already has `make.exe` on board; + * `mingw-make` should work as fine; + * Download some other port. For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm. +* Add path to your `make.exe` to system PATH or always use full path; +* Pass `-G"MinGW Makefiles"` and `-DCMAKE_MAKE_PROGRAM="make.exe"` + * It must be `MinGW Makefiles` and not `Unix Makefiles` even if your `make.exe` is not a MinGW's make. +* Run `make.exe` or `cmake --build .` for single-threaded build. + +### Projects with assembler files + +The _android-cmake_ should correctly handle projects with assembler sources (`*.s` or `*.S`). But if you still facing problems with assembler then try to upgrade your CMake to version newer than 2.8.5 + +## Copying + +_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) \ No newline at end of file diff --git a/NvCloth/Externals/CMakeModules/android/android.toolchain.cmake b/NvCloth/Externals/CMakeModules/android/android.toolchain.cmake new file mode 100644 index 0000000..7fc54f2 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/android/android.toolchain.cmake @@ -0,0 +1,1693 @@ +# Copyright (c) 2010-2011, Ethan Rublee +# Copyright (c) 2011-2014, Andrey Kamaev +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +# ------------------------------------------------------------------------------ +# Android CMake toolchain file, for use with the Android NDK r5-r10d +# Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended). +# See home page: https://github.com/taka-no-me/android-cmake +# +# Usage Linux: +# $ export ANDROID_NDK=/absolute/path/to/the/android-ndk +# $ mkdir build && cd build +# $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake .. +# $ make -j8 +# +# Usage Windows: +# You need native port of make to build your project. +# Android NDK r7 (and newer) already has make.exe on board. +# For older NDK you have to install it separately. +# For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm +# +# $ SET ANDROID_NDK=C:\absolute\path\to\the\android-ndk +# $ mkdir build && cd build +# $ cmake.exe -G"MinGW Makefiles" +# -DCMAKE_TOOLCHAIN_FILE=path\to\the\android.toolchain.cmake +# -DCMAKE_MAKE_PROGRAM="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" .. +# $ cmake.exe --build . +# +# +# Options (can be set as cmake parameters: -D=): +# ANDROID_NDK=/opt/android-ndk - path to the NDK root. +# Can be set as environment variable. Can be set only at first cmake run. +# +# ANDROID_ABI=armeabi-v7a - specifies the target Application Binary +# Interface (ABI). This option nearly matches to the APP_ABI variable +# used by ndk-build tool from Android NDK. +# +# Possible targets are: +# "armeabi" - ARMv5TE based CPU with software floating point operations +# "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions +# this ABI target is used by default +# "armeabi-v7a with NEON" - same as armeabi-v7a, but +# sets NEON as floating-point unit +# "armeabi-v7a with VFPV3" - same as armeabi-v7a, but +# sets VFPV3 as floating-point unit (has 32 registers instead of 16) +# "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP +# "x86" - IA-32 instruction set +# "mips" - MIPS32 instruction set +# +# 64-bit ABIs for NDK r10 and newer: +# "arm64-v8a" - ARMv8 AArch64 instruction set +# "x86_64" - Intel64 instruction set (r1) +# "mips64" - MIPS64 instruction set (r6) +# +# ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for. +# Option is read-only when standalone toolchain is used. +# Note: building for "android-L" requires explicit configuration. +# +# ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 - the name of compiler +# toolchain to be used. The list of possible values depends on the NDK +# version. For NDK r10c the possible values are: +# +# * aarch64-linux-android-4.9 +# * aarch64-linux-android-clang3.4 +# * aarch64-linux-android-clang3.5 +# * arm-linux-androideabi-4.6 +# * arm-linux-androideabi-4.8 +# * arm-linux-androideabi-4.9 (default) +# * arm-linux-androideabi-clang3.4 +# * arm-linux-androideabi-clang3.5 +# * mips64el-linux-android-4.9 +# * mips64el-linux-android-clang3.4 +# * mips64el-linux-android-clang3.5 +# * mipsel-linux-android-4.6 +# * mipsel-linux-android-4.8 +# * mipsel-linux-android-4.9 +# * mipsel-linux-android-clang3.4 +# * mipsel-linux-android-clang3.5 +# * x86-4.6 +# * x86-4.8 +# * x86-4.9 +# * x86-clang3.4 +# * x86-clang3.5 +# * x86_64-4.9 +# * x86_64-clang3.4 +# * x86_64-clang3.5 +# +# ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions +# instead of Thumb. Is not available for "armeabi-v6 with VFP" +# (is forced to be ON) ABI. +# +# ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker +# errors even if they are not used. +# +# ANDROID_SO_UNDEFINED=OFF - set ON to allow undefined symbols in shared +# libraries. Automatically turned for NDK r5x and r6x due to GLESv2 +# problems. +# +# ANDROID_STL=gnustl_static - specify the runtime to use. +# +# Possible values are: +# none -> Do not configure the runtime. +# system -> Use the default minimal system C++ runtime library. +# Implies -fno-rtti -fno-exceptions. +# Is not available for standalone toolchain. +# system_re -> Use the default minimal system C++ runtime library. +# Implies -frtti -fexceptions. +# Is not available for standalone toolchain. +# gabi++_static -> Use the GAbi++ runtime as a static library. +# Implies -frtti -fno-exceptions. +# Available for NDK r7 and newer. +# Is not available for standalone toolchain. +# gabi++_shared -> Use the GAbi++ runtime as a shared library. +# Implies -frtti -fno-exceptions. +# Available for NDK r7 and newer. +# Is not available for standalone toolchain. +# stlport_static -> Use the STLport runtime as a static library. +# Implies -fno-rtti -fno-exceptions for NDK before r7. +# Implies -frtti -fno-exceptions for NDK r7 and newer. +# Is not available for standalone toolchain. +# stlport_shared -> Use the STLport runtime as a shared library. +# Implies -fno-rtti -fno-exceptions for NDK before r7. +# Implies -frtti -fno-exceptions for NDK r7 and newer. +# Is not available for standalone toolchain. +# gnustl_static -> Use the GNU STL as a static library. +# Implies -frtti -fexceptions. +# gnustl_shared -> Use the GNU STL as a shared library. +# Implies -frtti -fno-exceptions. +# Available for NDK r7b and newer. +# Silently degrades to gnustl_static if not available. +# +# ANDROID_STL_FORCE_FEATURES=ON - turn rtti and exceptions support based on +# chosen runtime. If disabled, then the user is responsible for settings +# these options. +# +# What?: +# android-cmake toolchain searches for NDK/toolchain in the following order: +# ANDROID_NDK - cmake parameter +# ANDROID_NDK - environment variable +# ANDROID_STANDALONE_TOOLCHAIN - cmake parameter +# ANDROID_STANDALONE_TOOLCHAIN - environment variable +# ANDROID_NDK - default locations +# ANDROID_STANDALONE_TOOLCHAIN - default locations +# +# Make sure to do the following in your scripts: +# SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}" ) +# SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}" ) +# The flags will be prepopulated with critical flags, so don't loose them. +# Also be aware that toolchain also sets configuration-specific compiler +# flags and linker flags. +# +# ANDROID and BUILD_ANDROID will be set to true, you may test any of these +# variables to make necessary Android-specific configuration changes. +# +# Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64 +# will be set true, mutually exclusive. NEON option will be set true +# if VFP is set to NEON. +# +# ------------------------------------------------------------------------------ + +cmake_minimum_required( VERSION 2.6.3 ) + +if( DEFINED CMAKE_CROSSCOMPILING ) + # subsequent toolchain loading is not really needed + return() +endif() + +if( CMAKE_TOOLCHAIN_FILE ) + # touch toolchain variable to suppress "unused variable" warning +endif() + +# inherit settings in recursive loads +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if( _CMAKE_IN_TRY_COMPILE ) + include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL ) +endif() + +# this one is important +if( CMAKE_VERSION VERSION_GREATER "3.0.99" ) + set( CMAKE_SYSTEM_NAME Android ) +else() + set( CMAKE_SYSTEM_NAME Linux ) +endif() + +# this one not so much +set( CMAKE_SYSTEM_VERSION 1 ) + +# rpath makes low sense for Android +set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" ) +set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) + +# NDK search paths +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r11c -r11b -r11a -r10e -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS ) + if( CMAKE_HOST_WIN32 ) + file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) + set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}" "$ENV{SystemDrive}/NVPACK" ) + else() + file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS ) + set( ANDROID_NDK_SEARCH_PATHS /opt "${ANDROID_NDK_SEARCH_PATHS}/NVPACK" ) + endif() +endif() +if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) + set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain ) +endif() + +# known ABIs +set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) +set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" ) +set( ANDROID_SUPPORTED_ABIS_x86 "x86" ) +set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" ) +set( ANDROID_SUPPORTED_ABIS_mips "mips" ) +set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) + +# API level defaults +set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL_mips64 21 ) + + +macro( __LIST_FILTER listvar regex ) + if( ${listvar} ) + foreach( __val ${${listvar}} ) + if( __val MATCHES "${regex}" ) + list( REMOVE_ITEM ${listvar} "${__val}" ) + endif() + endforeach() + endif() +endmacro() + +macro( __INIT_VARIABLE var_name ) + set( __test_path 0 ) + foreach( __var ${ARGN} ) + if( __var STREQUAL "PATH" ) + set( __test_path 1 ) + break() + endif() + endforeach() + + if( __test_path AND NOT EXISTS "${${var_name}}" ) + unset( ${var_name} CACHE ) + endif() + + if( " ${${var_name}}" STREQUAL " " ) + set( __values 0 ) + foreach( __var ${ARGN} ) + if( __var STREQUAL "VALUES" ) + set( __values 1 ) + elseif( NOT __var STREQUAL "PATH" ) + if( __var MATCHES "^ENV_.*$" ) + string( REPLACE "ENV_" "" __var "${__var}" ) + set( __value "$ENV{${__var}}" ) + elseif( DEFINED ${__var} ) + set( __value "${${__var}}" ) + elseif( __values ) + set( __value "${__var}" ) + else() + set( __value "" ) + endif() + + if( NOT " ${__value}" STREQUAL " " AND (NOT __test_path OR EXISTS "${__value}") ) + set( ${var_name} "${__value}" ) + break() + endif() + endif() + endforeach() + unset( __value ) + unset( __values ) + endif() + + if( __test_path ) + file( TO_CMAKE_PATH "${${var_name}}" ${var_name} ) + endif() + unset( __test_path ) +endmacro() + +macro( __DETECT_NATIVE_API_LEVEL _var _path ) + set( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*.*$" ) + file( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" ) + if( NOT __apiFileContent ) + message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." ) + endif() + string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" ) + unset( __apiFileContent ) + unset( __ndkApiLevelRegex ) +endmacro() + +macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root ) + if( EXISTS "${_root}" ) + file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" ) + __LIST_FILTER( __gccExePath "^[.].*" ) + list( LENGTH __gccExePath __gccExePathsCount ) + if( NOT __gccExePathsCount EQUAL 1 AND NOT _CMAKE_IN_TRY_COMPILE ) + message( WARNING "Could not determine machine name for compiler from ${_root}" ) + set( ${_var} "" ) + else() + get_filename_component( __gccExeName "${__gccExePath}" NAME_WE ) + string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" ) + endif() + unset( __gccExePath ) + unset( __gccExePathsCount ) + unset( __gccExeName ) + else() + set( ${_var} "" ) + endif() +endmacro() + + +# fight against cygwin +set( ANDROID_FORBID_SYGWIN TRUE CACHE BOOL "Prevent cmake from working under cygwin and using cygwin tools") +mark_as_advanced( ANDROID_FORBID_SYGWIN ) +if( ANDROID_FORBID_SYGWIN ) + if( CYGWIN ) + message( FATAL_ERROR "Android NDK and android-cmake toolchain are not welcome Cygwin. It is unlikely that this cmake toolchain will work under cygwin. But if you want to try then you can set cmake variable ANDROID_FORBID_SYGWIN to FALSE and rerun cmake." ) + endif() + + if( CMAKE_HOST_WIN32 ) + # remove cygwin from PATH + set( __new_path "$ENV{PATH}") + __LIST_FILTER( __new_path "cygwin" ) + set(ENV{PATH} "${__new_path}") + unset(__new_path) + endif() +endif() + + +# detect current host platform +if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) ) + set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" ) + mark_as_advanced( ANDROID_NDK_HOST_X64 ) +endif() + +set( TOOL_OS_SUFFIX "" ) +if( CMAKE_HOST_APPLE ) + set( ANDROID_NDK_HOST_SYSTEM_NAME "darwin-x86_64" ) + set( ANDROID_NDK_HOST_SYSTEM_NAME2 "darwin-x86" ) +elseif( CMAKE_HOST_WIN32 ) + set( ANDROID_NDK_HOST_SYSTEM_NAME "windows-x86_64" ) + set( ANDROID_NDK_HOST_SYSTEM_NAME2 "windows" ) + set( TOOL_OS_SUFFIX ".exe" ) +elseif( CMAKE_HOST_UNIX ) + set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86_64" ) + set( ANDROID_NDK_HOST_SYSTEM_NAME2 "linux-x86" ) +else() + message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" ) +endif() + +if( NOT ANDROID_NDK_HOST_X64 ) + set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) +endif() + +# see if we have path to Android NDK +if( NOT ANDROID_NDK AND NOT ANDROID_STANDALONE_TOOLCHAIN ) + __INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK ) +endif() +if( NOT ANDROID_NDK ) + # see if we have path to Android standalone toolchain + __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN ) + + if( NOT ANDROID_STANDALONE_TOOLCHAIN ) + #try to find Android NDK in one of the the default locations + set( __ndkSearchPaths ) + foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} ) + foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} ) + list( APPEND __ndkSearchPaths "${__ndkSearchPath}/android-ndk${suffix}" ) + endforeach() + endforeach() + __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} ) + unset( __ndkSearchPaths ) + + if( ANDROID_NDK ) + message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" ) + message( STATUS " If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" ) + else() + #try to find Android standalone toolchain in one of the the default locations + __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) + + if( ANDROID_STANDALONE_TOOLCHAIN ) + message( STATUS "Using default path for standalone toolchain ${ANDROID_STANDALONE_TOOLCHAIN}" ) + message( STATUS " If you prefer to use a different location, please define the variable: ANDROID_STANDALONE_TOOLCHAIN" ) + endif( ANDROID_STANDALONE_TOOLCHAIN ) + endif( ANDROID_NDK ) + endif( NOT ANDROID_STANDALONE_TOOLCHAIN ) +endif( NOT ANDROID_NDK ) + +# remember found paths +if( ANDROID_NDK ) + get_filename_component( ANDROID_NDK "${ANDROID_NDK}" ABSOLUTE ) + set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE ) + set( BUILD_WITH_ANDROID_NDK True ) + if( EXISTS "${ANDROID_NDK}/RELEASE.TXT" ) + file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX "r[0-9]+[a-z]?" ) + string( REGEX MATCH "r([0-9]+)([a-z]?)" ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" ) + else() + set( ANDROID_NDK_RELEASE "r1x" ) + set( ANDROID_NDK_RELEASE_FULL "unreleased" ) + endif() + string( REGEX REPLACE "r([0-9]+)([a-z]?)" "\\1*1000" ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE}" ) + string( FIND " abcdefghijklmnopqastuvwxyz" "${CMAKE_MATCH_2}" __ndkReleaseLetterNum ) + math( EXPR ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE_NUM}+${__ndkReleaseLetterNum}" ) +elseif( ANDROID_STANDALONE_TOOLCHAIN ) + get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE ) + # try to detect change + if( CMAKE_AR ) + string( LENGTH "${ANDROID_STANDALONE_TOOLCHAIN}" __length ) + string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidStandaloneToolchainPreviousPath ) + if( NOT __androidStandaloneToolchainPreviousPath STREQUAL ANDROID_STANDALONE_TOOLCHAIN ) + message( FATAL_ERROR "It is not possible to change path to the Android standalone toolchain on subsequent run." ) + endif() + unset( __androidStandaloneToolchainPreviousPath ) + unset( __length ) + endif() + set( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" CACHE INTERNAL "Path of the Android standalone toolchain" FORCE ) + set( BUILD_WITH_STANDALONE_TOOLCHAIN True ) +else() + list(GET ANDROID_NDK_SEARCH_PATHS 0 ANDROID_NDK_SEARCH_PATH) + message( FATAL_ERROR "Could not find neither Android NDK nor Android standalone toolchain. + You should either set an environment variable: + export ANDROID_NDK=~/my-android-ndk + or + export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain + or put the toolchain or NDK in the default path: + sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}/android-ndk + sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" ) +endif() + +# android NDK layout +if( BUILD_WITH_ANDROID_NDK ) + if( NOT DEFINED ANDROID_NDK_LAYOUT ) + # try to automatically detect the layout + if( EXISTS "${ANDROID_NDK}/RELEASE.TXT") + set( ANDROID_NDK_LAYOUT "RELEASE" ) + elseif( EXISTS "${ANDROID_NDK}/../../linux-x86/toolchain/" ) + set( ANDROID_NDK_LAYOUT "LINARO" ) + elseif( EXISTS "${ANDROID_NDK}/../../gcc/" ) + set( ANDROID_NDK_LAYOUT "ANDROID" ) + endif() + endif() + set( ANDROID_NDK_LAYOUT "${ANDROID_NDK_LAYOUT}" CACHE STRING "The inner layout of NDK" ) + mark_as_advanced( ANDROID_NDK_LAYOUT ) + if( ANDROID_NDK_LAYOUT STREQUAL "LINARO" ) + set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment + set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../${ANDROID_NDK_HOST_SYSTEM_NAME}/toolchain" ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH "" ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" ) + elseif( ANDROID_NDK_LAYOUT STREQUAL "ANDROID" ) + set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment + set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../gcc/${ANDROID_NDK_HOST_SYSTEM_NAME}/arm" ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH "" ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" ) + else() # ANDROID_NDK_LAYOUT STREQUAL "RELEASE" + set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/toolchains" ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME2}" ) + endif() + get_filename_component( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK_TOOLCHAINS_PATH}" ABSOLUTE ) + + # try to detect change of NDK + if( CMAKE_AR ) + string( LENGTH "${ANDROID_NDK_TOOLCHAINS_PATH}" __length ) + string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath ) + if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK_TOOLCHAINS_PATH ) + message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first. + " ) + endif() + unset( __androidNdkPreviousPath ) + unset( __length ) + endif() +endif() + + +# get all the details about standalone toolchain +if( BUILD_WITH_STANDALONE_TOOLCHAIN ) + __DETECT_NATIVE_API_LEVEL( ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot/usr/include/android/api-level.h" ) + set( ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) + set( __availableToolchains "standalone" ) + __DETECT_TOOLCHAIN_MACHINE_NAME( __availableToolchainMachines "${ANDROID_STANDALONE_TOOLCHAIN}" ) + if( NOT __availableToolchainMachines ) + message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." ) + endif() + if( __availableToolchainMachines MATCHES x86_64 ) + set( __availableToolchainArchs "x86_64" ) + elseif( __availableToolchainMachines MATCHES i686 ) + set( __availableToolchainArchs "x86" ) + elseif( __availableToolchainMachines MATCHES aarch64 ) + set( __availableToolchainArchs "arm64" ) + elseif( __availableToolchainMachines MATCHES arm ) + set( __availableToolchainArchs "arm" ) + elseif( __availableToolchainMachines MATCHES mips64el ) + set( __availableToolchainArchs "mips64" ) + elseif( __availableToolchainMachines MATCHES mipsel ) + set( __availableToolchainArchs "mips" ) + endif() + execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion + OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE ) + string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" ) + if( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/bin/clang${TOOL_OS_SUFFIX}" ) + list( APPEND __availableToolchains "standalone-clang" ) + list( APPEND __availableToolchainMachines ${__availableToolchainMachines} ) + list( APPEND __availableToolchainArchs ${__availableToolchainArchs} ) + list( APPEND __availableToolchainCompilerVersions ${__availableToolchainCompilerVersions} ) + endif() +endif() + +macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath ) + foreach( __toolchain ${${__availableToolchainsLst}} ) + if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" ) + SET( __toolchainVersionRegex "^TOOLCHAIN_VERSION[\t ]+:=[\t ]+(.*)$" ) + FILE( STRINGS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}/setup.mk" __toolchainVersionStr REGEX "${__toolchainVersionRegex}" ) + if( __toolchainVersionStr ) + string( REGEX REPLACE "${__toolchainVersionRegex}" "\\1" __toolchainVersionStr "${__toolchainVersionStr}" ) + string( REGEX REPLACE "-clang3[.][0-9]$" "-${__toolchainVersionStr}" __gcc_toolchain "${__toolchain}" ) + else() + string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) + endif() + unset( __toolchainVersionStr ) + unset( __toolchainVersionRegex ) + else() + set( __gcc_toolchain "${__toolchain}" ) + endif() + __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" ) + if( __machine ) + string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" ) + if( __machine MATCHES x86_64 ) + set( __arch "x86_64" ) + elseif( __machine MATCHES i686 ) + set( __arch "x86" ) + elseif( __machine MATCHES aarch64 ) + set( __arch "arm64" ) + elseif( __machine MATCHES arm ) + set( __arch "arm" ) + elseif( __machine MATCHES mips64el ) + set( __arch "mips64" ) + elseif( __machine MATCHES mipsel ) + set( __arch "mips" ) + else() + set( __arch "" ) + endif() + #message("machine: !${__machine}!\narch: !${__arch}!\nversion: !${__version}!\ntoolchain: !${__toolchain}!\n") + if (__arch) + list( APPEND __availableToolchainMachines "${__machine}" ) + list( APPEND __availableToolchainArchs "${__arch}" ) + list( APPEND __availableToolchainCompilerVersions "${__version}" ) + list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) + endif() + endif() + unset( __gcc_toolchain ) + endforeach() +endmacro() + +# get all the details about NDK +if( BUILD_WITH_ANDROID_NDK ) + file( GLOB ANDROID_SUPPORTED_NATIVE_API_LEVELS RELATIVE "${ANDROID_NDK}/platforms" "${ANDROID_NDK}/platforms/android-*" ) + string( REPLACE "android-" "" ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_SUPPORTED_NATIVE_API_LEVELS}" ) + set( __availableToolchains "" ) + set( __availableToolchainMachines "" ) + set( __availableToolchainArchs "" ) + set( __availableToolchainCompilerVersions "" ) + if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_TOOLCHAIN_NAME}/" ) + # do not go through all toolchains if we know the name + set( __availableToolchainsLst "${ANDROID_TOOLCHAIN_NAME}" ) + __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) + if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) + __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) + if( __availableToolchains ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} ) + endif() + endif() + endif() + if( NOT __availableToolchains ) + file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" ) + if( __availableToolchainsLst ) + list(SORT __availableToolchainsLst) # we need clang to go after gcc + endif() + __LIST_FILTER( __availableToolchainsLst "^[.]" ) + __LIST_FILTER( __availableToolchainsLst "llvm" ) + __LIST_FILTER( __availableToolchainsLst "renderscript" ) + __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) + if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) + __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) + if( __availableToolchains ) + set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} ) + endif() + endif() + endif() + if( NOT __availableToolchains ) + message( FATAL_ERROR "Could not find any working toolchain in the NDK. Probably your Android NDK is broken." ) + endif() +endif() + +# build list of available ABIs +set( ANDROID_SUPPORTED_ABIS "" ) +set( __uniqToolchainArchNames ${__availableToolchainArchs} ) +list( REMOVE_DUPLICATES __uniqToolchainArchNames ) +list( SORT __uniqToolchainArchNames ) +foreach( __arch ${__uniqToolchainArchNames} ) + list( APPEND ANDROID_SUPPORTED_ABIS ${ANDROID_SUPPORTED_ABIS_${__arch}} ) +endforeach() +unset( __uniqToolchainArchNames ) +if( NOT ANDROID_SUPPORTED_ABIS ) + message( FATAL_ERROR "No one of known Android ABIs is supported by this cmake toolchain." ) +endif() + +# choose target ABI +__INIT_VARIABLE( ANDROID_ABI VALUES ${ANDROID_SUPPORTED_ABIS} ) +# verify that target ABI is supported +list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx ) +if( __androidAbiIdx EQUAL -1 ) + string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS "${ANDROID_SUPPORTED_ABIS}" ) + message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain. + Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\" + " ) +endif() +unset( __androidAbiIdx ) + +# set target ABI options +if( ANDROID_ABI STREQUAL "x86" ) + set( X86 true ) + set( ANDROID_NDK_ABI_NAME "x86" ) + set( ANDROID_ARCH_NAME "x86" ) + set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" ) + set( CMAKE_SYSTEM_PROCESSOR "i686" ) +elseif( ANDROID_ABI STREQUAL "x86_64" ) + set( X86 true ) + set( X86_64 true ) + set( ANDROID_NDK_ABI_NAME "x86_64" ) + set( ANDROID_ARCH_NAME "x86_64" ) + set( CMAKE_SYSTEM_PROCESSOR "x86_64" ) + set( ANDROID_LLVM_TRIPLE "x86_64-none-linux-android" ) +elseif( ANDROID_ABI STREQUAL "mips64" ) + set( MIPS64 true ) + set( ANDROID_NDK_ABI_NAME "mips64" ) + set( ANDROID_ARCH_NAME "mips64" ) + set( ANDROID_LLVM_TRIPLE "mips64el-none-linux-android" ) + set( CMAKE_SYSTEM_PROCESSOR "mips64" ) +elseif( ANDROID_ABI STREQUAL "mips" ) + set( MIPS true ) + set( ANDROID_NDK_ABI_NAME "mips" ) + set( ANDROID_ARCH_NAME "mips" ) + set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" ) + set( CMAKE_SYSTEM_PROCESSOR "mips" ) +elseif( ANDROID_ABI STREQUAL "arm64-v8a" ) + set( ARM64_V8A true ) + set( ANDROID_NDK_ABI_NAME "arm64-v8a" ) + set( ANDROID_ARCH_NAME "arm64" ) + set( ANDROID_LLVM_TRIPLE "aarch64-none-linux-android" ) + set( CMAKE_SYSTEM_PROCESSOR "aarch64" ) + set( VFPV3 true ) + set( NEON true ) +elseif( ANDROID_ABI STREQUAL "armeabi" ) + set( ARMEABI true ) + set( ANDROID_NDK_ABI_NAME "armeabi" ) + set( ANDROID_ARCH_NAME "arm" ) + set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) + set( CMAKE_SYSTEM_PROCESSOR "armv5te" ) +elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" ) + set( ARMEABI_V6 true ) + set( ANDROID_NDK_ABI_NAME "armeabi" ) + set( ANDROID_ARCH_NAME "arm" ) + set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) + set( CMAKE_SYSTEM_PROCESSOR "armv6" ) + # need always fallback to older platform + set( ARMEABI true ) +elseif( ANDROID_ABI STREQUAL "armeabi-v7a") + set( ARMEABI_V7A true ) + set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) + set( ANDROID_ARCH_NAME "arm" ) + set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) + set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) +elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" ) + set( ARMEABI_V7A true ) + set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) + set( ANDROID_ARCH_NAME "arm" ) + set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) + set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) + set( VFPV3 true ) +elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" ) + set( ARMEABI_V7A true ) + set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) + set( ANDROID_ARCH_NAME "arm" ) + set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) + set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) + set( VFPV3 true ) + set( NEON true ) +else() + message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." ) +endif() + +if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" ) + # really dirty hack + # it is not possible to change CMAKE_SYSTEM_PROCESSOR after the first run... + file( APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" "SET(CMAKE_SYSTEM_PROCESSOR \"${CMAKE_SYSTEM_PROCESSOR}\")\n" ) +endif() + +if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 ) + __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD VALUES OFF ) + set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE ) + mark_as_advanced( ANDROID_FORCE_ARM_BUILD ) +else() + unset( ANDROID_FORCE_ARM_BUILD CACHE ) +endif() + +# choose toolchain +if( ANDROID_TOOLCHAIN_NAME ) + list( FIND __availableToolchains "${ANDROID_TOOLCHAIN_NAME}" __toolchainIdx ) + if( __toolchainIdx EQUAL -1 ) + list( SORT __availableToolchains ) + string( REPLACE ";" "\n * " toolchains_list "${__availableToolchains}" ) + set( toolchains_list " * ${toolchains_list}") + message( FATAL_ERROR "Specified toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is missing in your NDK or broken. Please verify that your NDK is working or select another compiler toolchain. +To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" ) + endif() + list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch ) + if( NOT __toolchainArch STREQUAL ANDROID_ARCH_NAME ) + message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." ) + endif() +else() + set( __toolchainIdx -1 ) + set( __applicableToolchains "" ) + set( __toolchainMaxVersion "0.0.0" ) + list( LENGTH __availableToolchains __availableToolchainsCount ) + math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" ) + foreach( __idx RANGE ${__availableToolchainsCount} ) + list( GET __availableToolchainArchs ${__idx} __toolchainArch ) + if( __toolchainArch STREQUAL ANDROID_ARCH_NAME ) + list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion ) + string( REPLACE "x" "99" __toolchainVersion "${__toolchainVersion}") + if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion ) + set( __toolchainMaxVersion "${__toolchainVersion}" ) + set( __toolchainIdx ${__idx} ) + endif() + endif() + endforeach() + unset( __availableToolchainsCount ) + unset( __toolchainMaxVersion ) + unset( __toolchainVersion ) +endif() +unset( __toolchainArch ) +if( __toolchainIdx EQUAL -1 ) + message( FATAL_ERROR "No one of available compiler toolchains is able to compile for ${ANDROID_ARCH_NAME} platform." ) +endif() +list( GET __availableToolchains ${__toolchainIdx} ANDROID_TOOLCHAIN_NAME ) +list( GET __availableToolchainMachines ${__toolchainIdx} ANDROID_TOOLCHAIN_MACHINE_NAME ) +list( GET __availableToolchainCompilerVersions ${__toolchainIdx} ANDROID_COMPILER_VERSION ) + +unset( __toolchainIdx ) +unset( __availableToolchains ) +unset( __availableToolchainMachines ) +unset( __availableToolchainArchs ) +unset( __availableToolchainCompilerVersions ) + +# choose native API level +__INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL ) +string( REPLACE "android-" "" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" ) +string( STRIP "${ANDROID_NATIVE_API_LEVEL}" ANDROID_NATIVE_API_LEVEL ) +# adjust API level +set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} ) +foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) + if( (__level LESS ANDROID_NATIVE_API_LEVEL OR __level STREQUAL ANDROID_NATIVE_API_LEVEL) AND NOT __level LESS __real_api_level ) + set( __real_api_level ${__level} ) + endif() +endforeach() +if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL STREQUAL __real_api_level ) + message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'") + set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} ) +endif() +unset(__real_api_level) +# validate +list( FIND ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_NATIVE_API_LEVEL}" __levelIdx ) +if( __levelIdx EQUAL -1 ) + message( SEND_ERROR "Specified Android native API level 'android-${ANDROID_NATIVE_API_LEVEL}' is not supported by your NDK/toolchain." ) +else() + if( BUILD_WITH_ANDROID_NDK ) + __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" ) + if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL AND NOT __realApiLevel GREATER 9000 ) + message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." ) + endif() + unset( __realApiLevel ) + endif() + set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE ) + set( CMAKE_ANDROID_API ${ANDROID_NATIVE_API_LEVEL} ) + if( CMAKE_VERSION VERSION_GREATER "2.8" ) + list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS ) + set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) + endif() +endif() +unset( __levelIdx ) + + +# remember target ABI +set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE ) +if( CMAKE_VERSION VERSION_GREATER "2.8" ) + list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} ) + set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} ) +endif() + + +# runtime choice (STL, rtti, exceptions) +if( NOT ANDROID_STL ) + set( ANDROID_STL gnustl_static ) +endif() +set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" ) +set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" ) +mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES ) + +if( BUILD_WITH_ANDROID_NDK ) + if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared)$") + message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". +The possible values are: + none -> Do not configure the runtime. + system -> Use the default minimal system C++ runtime library. + system_re -> Same as system but with rtti and exceptions. + gabi++_static -> Use the GAbi++ runtime as a static library. + gabi++_shared -> Use the GAbi++ runtime as a shared library. + stlport_static -> Use the STLport runtime as a static library. + stlport_shared -> Use the STLport runtime as a shared library. + gnustl_static -> (default) Use the GNU STL as a static library. + gnustl_shared -> Use the GNU STL as a shared library. +" ) + endif() +elseif( BUILD_WITH_STANDALONE_TOOLCHAIN ) + if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$") + message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". +The possible values are: + none -> Do not configure the runtime. + gnustl_static -> (default) Use the GNU STL as a static library. + gnustl_shared -> Use the GNU STL as a shared library. +" ) + endif() +endif() + +unset( ANDROID_RTTI ) +unset( ANDROID_EXCEPTIONS ) +unset( ANDROID_STL_INCLUDE_DIRS ) +unset( __libstl ) +unset( __libsupcxx ) + +if( NOT _CMAKE_IN_TRY_COMPILE AND ANDROID_NDK_RELEASE STREQUAL "r7b" AND ARMEABI_V7A AND NOT VFPV3 AND ANDROID_STL MATCHES "gnustl" ) + message( WARNING "The GNU STL armeabi-v7a binaries from NDK r7b can crash non-NEON devices. The files provided with NDK r7b were not configured properly, resulting in crashes on Tegra2-based devices and others when trying to use certain floating-point functions (e.g., cosf, sinf, expf). +You are strongly recommended to switch to another NDK release. +" ) +endif() + +if( NOT _CMAKE_IN_TRY_COMPILE AND X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" ) + message( WARNING "The x86 system header file from NDK r6 has incorrect definition for ptrdiff_t. You are recommended to upgrade to a newer NDK release or manually patch the header: +See https://android.googlesource.com/platform/development.git f907f4f9d4e56ccc8093df6fee54454b8bcab6c2 + diff --git a/ndk/platforms/android-9/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h + index 5e28c64..65892a1 100644 + --- a/ndk/platforms/android-9/arch-x86/include/machine/_types.h + +++ b/ndk/platforms/android-9/arch-x86/include/machine/_types.h + @@ -51,7 +51,11 @@ typedef long int ssize_t; + #endif + #ifndef _PTRDIFF_T + #define _PTRDIFF_T + -typedef long ptrdiff_t; + +# ifdef __ANDROID__ + + typedef int ptrdiff_t; + +# else + + typedef long ptrdiff_t; + +# endif + #endif +" ) +endif() + + +# setup paths and STL for standalone toolchain +if( BUILD_WITH_STANDALONE_TOOLCHAIN ) + set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) + set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) + set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" ) + + if( NOT ANDROID_STL STREQUAL "none" ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/include/c++/${ANDROID_COMPILER_VERSION}" ) + if( NOT EXISTS "${ANDROID_STL_INCLUDE_DIRS}" ) + # old location ( pre r8c ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" ) + endif() + if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" ) + list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" ) + elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" ) + list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb" ) + else() + list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" ) + endif() + # always search static GNU STL to get the location of libsupc++.a + if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" ) + elseif( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}" ) + elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libstdc++.a" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb" ) + elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libstdc++.a" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" ) + endif() + if( __libstl ) + set( __libsupcxx "${__libstl}/libsupc++.a" ) + set( __libstl "${__libstl}/libstdc++.a" ) + endif() + if( NOT EXISTS "${__libsupcxx}" ) + message( FATAL_ERROR "The required libstdsupc++.a is missing in your standalone toolchain. + Usually it happens because of bug in make-standalone-toolchain.sh script from NDK r7, r7b and r7c. + You need to either upgrade to newer NDK or manually copy + $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a + to + ${__libsupcxx} + " ) + endif() + if( ANDROID_STL STREQUAL "gnustl_shared" ) + if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) + elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) + elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) + endif() + endif() + endif() +endif() + +# clang +if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" ) + set( ANDROID_COMPILER_IS_CLANG 1 ) + execute_process( COMMAND "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/clang${TOOL_OS_SUFFIX}" --version OUTPUT_VARIABLE ANDROID_CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) + string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}") +elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" ) + string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}") + string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-${ANDROID_COMPILER_VERSION}" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) + if( NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}/bin/clang${TOOL_OS_SUFFIX}" ) + message( FATAL_ERROR "Could not find the Clang compiler driver" ) + endif() + set( ANDROID_COMPILER_IS_CLANG 1 ) + set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) +else() + set( ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) + unset( ANDROID_COMPILER_IS_CLANG CACHE ) +endif() + +string( REPLACE "." "" _clang_name "clang${ANDROID_CLANG_VERSION}" ) +if( NOT EXISTS "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" ) + set( _clang_name "clang" ) +endif() + + +# setup paths and STL for NDK +if( BUILD_WITH_ANDROID_NDK ) + set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) + set( ANDROID_SYSROOT "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}" ) + + if( ANDROID_STL STREQUAL "none" ) + # do nothing + elseif( ANDROID_STL STREQUAL "system" ) + set( ANDROID_RTTI OFF ) + set( ANDROID_EXCEPTIONS OFF ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) + elseif( ANDROID_STL STREQUAL "system_re" ) + set( ANDROID_RTTI ON ) + set( ANDROID_EXCEPTIONS ON ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) + elseif( ANDROID_STL MATCHES "gabi" ) + if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 + message( FATAL_ERROR "gabi++ is not available in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.") + endif() + set( ANDROID_RTTI ON ) + set( ANDROID_EXCEPTIONS OFF ) + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" ) + set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" ) + elseif( ANDROID_STL MATCHES "stlport" ) + if( NOT ANDROID_NDK_RELEASE_NUM LESS 8004 ) # before r8d + set( ANDROID_EXCEPTIONS ON ) + else() + set( ANDROID_EXCEPTIONS OFF ) + endif() + if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 + set( ANDROID_RTTI OFF ) + else() + set( ANDROID_RTTI ON ) + endif() + set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/stlport/stlport" ) + set( __libstl "${ANDROID_NDK}/sources/cxx-stl/stlport/libs/${ANDROID_NDK_ABI_NAME}/libstlport_static.a" ) + elseif( ANDROID_STL MATCHES "gnustl" ) + set( ANDROID_EXCEPTIONS ON ) + set( ANDROID_RTTI ON ) + if( EXISTS "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) + if( ARMEABI_V7A AND ANDROID_COMPILER_VERSION VERSION_EQUAL "4.7" AND ANDROID_NDK_RELEASE STREQUAL "r8d" ) + # gnustl binary for 4.7 compiler is buggy :( + # TODO: look for right fix + set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.6" ) + else() + set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) + endif() + else() + set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" ) + endif() + set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libstl}/include/backward" ) + if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) + set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) + else() + set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" ) + endif() + else() + message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) + endif() + # find libsupc++.a - rtti & exceptions + if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" ) + set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r8b or newer + if( NOT EXISTS "${__libsupcxx}" ) + set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r7-r8 + endif() + if( NOT EXISTS "${__libsupcxx}" ) # before r7 + if( ARMEABI_V7A ) + if( ANDROID_FORCE_ARM_BUILD ) + set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libsupc++.a" ) + else() + set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libsupc++.a" ) + endif() + elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD ) + set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libsupc++.a" ) + else() + set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libsupc++.a" ) + endif() + endif() + if( NOT EXISTS "${__libsupcxx}") + message( ERROR "Could not find libsupc++.a for a chosen platform. Either your NDK is not supported or is broken.") + endif() + endif() +endif() + + +# case of shared STL linkage +if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl ) + string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" ) + # TODO: check if .so file exists before the renaming +endif() + + +# ccache support +__INIT_VARIABLE( _ndk_ccache NDK_CCACHE ENV_NDK_CCACHE ) +if( _ndk_ccache ) + if( DEFINED NDK_CCACHE AND NOT EXISTS NDK_CCACHE ) + unset( NDK_CCACHE CACHE ) + endif() + find_program( NDK_CCACHE "${_ndk_ccache}" DOC "The path to ccache binary") +else() + unset( NDK_CCACHE CACHE ) +endif() +unset( _ndk_ccache ) + + +# setup the cross-compiler +if( NOT CMAKE_C_COMPILER ) + if( NDK_CCACHE AND NOT ANDROID_SYSROOT MATCHES "[ ;\"]" ) + set( CMAKE_C_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C compiler" ) + set( CMAKE_CXX_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C++ compiler" ) + if( ANDROID_COMPILER_IS_CLANG ) + set( CMAKE_C_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") + set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") + else() + set( CMAKE_C_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") + set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") + endif() + else() + if( ANDROID_COMPILER_IS_CLANG ) + set( CMAKE_C_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") + set( CMAKE_CXX_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") + else() + set( CMAKE_C_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler" ) + set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler" ) + endif() + endif() + set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "assembler" ) + set( CMAKE_STRIP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}" CACHE PATH "strip" ) + if( EXISTS "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" ) + # Use gcc-ar if we have it for better LTO support. + set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) + else() + set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) + endif() + set( CMAKE_LINKER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}" CACHE PATH "linker" ) + set( CMAKE_NM "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-nm${TOOL_OS_SUFFIX}" CACHE PATH "nm" ) + set( CMAKE_OBJCOPY "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objcopy${TOOL_OS_SUFFIX}" CACHE PATH "objcopy" ) + set( CMAKE_OBJDUMP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objdump${TOOL_OS_SUFFIX}" CACHE PATH "objdump" ) + set( CMAKE_RANLIB "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ranlib${TOOL_OS_SUFFIX}" CACHE PATH "ranlib" ) +endif() + +set( _CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_MACHINE_NAME}-" ) +if( CMAKE_VERSION VERSION_LESS 2.8.5 ) + set( CMAKE_ASM_COMPILER_ARG1 "-c" ) +endif() +if( APPLE ) + find_program( CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool ) + if( NOT CMAKE_INSTALL_NAME_TOOL ) + message( FATAL_ERROR "Could not find install_name_tool, please check your installation." ) + endif() + mark_as_advanced( CMAKE_INSTALL_NAME_TOOL ) +endif() + +# Force set compilers because standard identification works badly for us +include( CMakeForceCompiler ) +CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU ) +if( ANDROID_COMPILER_IS_CLANG ) + set( CMAKE_C_COMPILER_ID Clang ) +endif() +set( CMAKE_C_PLATFORM_ID Linux ) +if( X86_64 OR MIPS64 OR ARM64_V8A ) + set( CMAKE_C_SIZEOF_DATA_PTR 8 ) +else() + set( CMAKE_C_SIZEOF_DATA_PTR 4 ) +endif() +set( CMAKE_C_HAS_ISYSROOT 1 ) +set( CMAKE_C_COMPILER_ABI ELF ) +CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU ) +if( ANDROID_COMPILER_IS_CLANG ) + set( CMAKE_CXX_COMPILER_ID Clang) +endif() +set( CMAKE_CXX_PLATFORM_ID Linux ) +set( CMAKE_CXX_SIZEOF_DATA_PTR ${CMAKE_C_SIZEOF_DATA_PTR} ) +set( CMAKE_CXX_HAS_ISYSROOT 1 ) +set( CMAKE_CXX_COMPILER_ABI ELF ) +set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C ) +# force ASM compiler (required for CMake < 2.8.5) +set( CMAKE_ASM_COMPILER_ID_RUN TRUE ) +set( CMAKE_ASM_COMPILER_ID GNU ) +set( CMAKE_ASM_COMPILER_WORKS TRUE ) +set( CMAKE_ASM_COMPILER_FORCED TRUE ) +set( CMAKE_COMPILER_IS_GNUASM 1) +set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm ) + +foreach( lang C CXX ASM ) + if( ANDROID_COMPILER_IS_CLANG ) + set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_CLANG_VERSION} ) + else() + set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_COMPILER_VERSION} ) + endif() +endforeach() + +# flags and definitions +remove_definitions( -DANDROID ) +add_definitions( -DANDROID ) + +if( ANDROID_SYSROOT MATCHES "[ ;\"]" ) + if( CMAKE_HOST_WIN32 ) + # try to convert path to 8.3 form + file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "@echo %~s1" ) + execute_process( COMMAND "$ENV{ComSpec}" /c "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "${ANDROID_SYSROOT}" + OUTPUT_VARIABLE __path OUTPUT_STRIP_TRAILING_WHITESPACE + RESULT_VARIABLE __result ERROR_QUIET ) + if( __result EQUAL 0 ) + file( TO_CMAKE_PATH "${__path}" ANDROID_SYSROOT ) + set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" ) + else() + set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" ) + endif() + else() + set( ANDROID_CXX_FLAGS "'--sysroot=${ANDROID_SYSROOT}'" ) + endif() + if( NOT _CMAKE_IN_TRY_COMPILE ) + # quotes can break try_compile and compiler identification + message(WARNING "Path to your Android NDK (or toolchain) has non-alphanumeric symbols.\nThe build might be broken.\n") + endif() +else() + set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" ) +endif() + +# NDK flags +if (ARM64_V8A ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) + set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) + set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) + if( NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) + endif() +elseif( ARMEABI OR ARMEABI_V7A) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) + if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 ) + set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" ) + set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) + if( NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -finline-limit=64" ) + endif() + else() + # always compile ARMEABI_V6 in arm mode; otherwise there is no difference from ARMEABI + set( ANDROID_CXX_FLAGS_RELEASE "-marm -fomit-frame-pointer -fstrict-aliasing" ) + set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) + if( NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) + endif() + endif() +elseif( X86 OR X86_64 ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) + if( NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) + endif() + set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) + set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) +elseif( MIPS OR MIPS64 ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0" ) + set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" ) + set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer" ) + if( NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers" ) + set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) + endif() +elseif() + set( ANDROID_CXX_FLAGS_RELEASE "" ) + set( ANDROID_CXX_FLAGS_DEBUG "" ) +endif() + +set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fsigned-char" ) # good/necessary when porting desktop libraries + +if( NOT X86 AND NOT ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "-Wno-psabi ${ANDROID_CXX_FLAGS}" ) +endif() + +if( NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.6" ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -no-canonical-prefixes" ) # see https://android-review.googlesource.com/#/c/47564/ +endif() + +# ABI-specific flags +if( ARMEABI_V7A ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" ) + if( NEON ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" ) + elseif( VFPV3 ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" ) + else() + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" ) + endif() +elseif( ARMEABI_V6 ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv6 -mfloat-abi=softfp -mfpu=vfp" ) # vfp == vfpv2 +elseif( ARMEABI ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv5te -mtune=xscale -msoft-float" ) +endif() + +if( ANDROID_STL MATCHES "gnustl" AND (EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}") ) + set( CMAKE_CXX_CREATE_SHARED_LIBRARY " -o " ) + set( CMAKE_CXX_CREATE_SHARED_MODULE " -o " ) + set( CMAKE_CXX_LINK_EXECUTABLE " -o " ) +else() + set( CMAKE_CXX_CREATE_SHARED_LIBRARY " -o " ) + set( CMAKE_CXX_CREATE_SHARED_MODULE " -o " ) + set( CMAKE_CXX_LINK_EXECUTABLE " -o " ) +endif() + +# STL +if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" ) + if( EXISTS "${__libstl}" ) + set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libstl}\"" ) + set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libstl}\"" ) + set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libstl}\"" ) + endif() + if( EXISTS "${__libsupcxx}" ) + set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" ) + set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" ) + set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libsupcxx}\"" ) + # C objects: + set( CMAKE_C_CREATE_SHARED_LIBRARY " -o " ) + set( CMAKE_C_CREATE_SHARED_MODULE " -o " ) + set( CMAKE_C_LINK_EXECUTABLE " -o " ) + set( CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" ) + set( CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" ) + set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} \"${__libsupcxx}\"" ) + endif() + if( ANDROID_STL MATCHES "gnustl" ) + if( NOT EXISTS "${ANDROID_LIBM_PATH}" ) + set( ANDROID_LIBM_PATH -lm ) + endif() + set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} ${ANDROID_LIBM_PATH}" ) + set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} ${ANDROID_LIBM_PATH}" ) + set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_LIBM_PATH}" ) + endif() +endif() + +# variables controlling optional build flags +if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 + # libGLESv2.so in NDK's prior to r7 refers to missing external symbols. + # So this flag option is required for all projects using OpenGL from native. + __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES ON ) +else() + __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES OFF ) +endif() +__INIT_VARIABLE( ANDROID_NO_UNDEFINED VALUES ON ) +__INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING VALUES ON ) +__INIT_VARIABLE( ANDROID_GOLD_LINKER VALUES ON ) +__INIT_VARIABLE( ANDROID_NOEXECSTACK VALUES ON ) +__INIT_VARIABLE( ANDROID_RELRO VALUES ON ) + +set( ANDROID_NO_UNDEFINED ${ANDROID_NO_UNDEFINED} CACHE BOOL "Show all undefined symbols as linker errors" ) +set( ANDROID_SO_UNDEFINED ${ANDROID_SO_UNDEFINED} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) +set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Put each function in separate section and enable garbage collection of unused input sections at link time" ) +set( ANDROID_GOLD_LINKER ${ANDROID_GOLD_LINKER} CACHE BOOL "Enables gold linker" ) +set( ANDROID_NOEXECSTACK ${ANDROID_NOEXECSTACK} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) +set( ANDROID_RELRO ${ANDROID_RELRO} CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" ) +mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO ) + +# linker flags +set( ANDROID_LINKER_FLAGS "" ) + +if( ARMEABI_V7A ) + # this is *required* to use the following linker flags that routes around + # a CPU bug in some Cortex-A8 implementations: + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--fix-cortex-a8" ) +endif() + +if( ANDROID_NO_UNDEFINED ) + if( MIPS ) + # there is some sysroot-related problem in mips linker... + if( NOT ANDROID_SYSROOT MATCHES "[ ;\"]" ) + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib" ) + endif() + else() + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" ) + endif() +endif() + +if( ANDROID_SO_UNDEFINED ) + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-allow-shlib-undefined" ) +endif() + +if( ANDROID_FUNCTION_LEVEL_LINKING ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" ) + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" ) +endif() + +if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" ) + if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) ) + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" ) + elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" ) + elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE ) + message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342 + On Linux and OS X host platform you can workaround this problem using gold linker (default). + Rerun cmake with -DANDROID_GOLD_LINKER=ON option in case of problems. +" ) + endif() +endif() # version 4.6 + +if( ANDROID_NOEXECSTACK ) + if( ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -Xclang -mnoexecstack" ) + else() + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -Wa,--noexecstack" ) + endif() + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,noexecstack" ) +endif() + +if( ANDROID_RELRO ) + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now" ) +endif() + +if( ANDROID_COMPILER_IS_CLANG ) + set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} -Qunused-arguments ${ANDROID_CXX_FLAGS}" ) + if( BUILD_WITH_ANDROID_NDK ) + set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" ) + endif() +endif() + +# cache flags +set( CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags" ) +set( CMAKE_C_FLAGS "" CACHE STRING "c flags" ) +set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "c++ Release flags" ) +set( CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "c Release flags" ) +set( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c++ Debug flags" ) +set( CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c Debug flags" ) +set( CMAKE_SHARED_LINKER_FLAGS "" CACHE STRING "shared linker flags" ) +set( CMAKE_MODULE_LINKER_FLAGS "" CACHE STRING "module linker flags" ) +set( CMAKE_EXE_LINKER_FLAGS "-Wl,-z,nocopyreloc" CACHE STRING "executable linker flags" ) + +# put flags to cache (for debug purpose only) +set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" CACHE INTERNAL "Android specific c/c++ flags" ) +set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE}" CACHE INTERNAL "Android specific c/c++ Release flags" ) +set( ANDROID_CXX_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG}" CACHE INTERNAL "Android specific c/c++ Debug flags" ) +set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS}" CACHE INTERNAL "Android specific c/c++ linker flags" ) + +# finish flags +set( CMAKE_CXX_FLAGS "${ANDROID_CXX_FLAGS} ${CMAKE_CXX_FLAGS}" ) +set( CMAKE_C_FLAGS "${ANDROID_CXX_FLAGS} ${CMAKE_C_FLAGS}" ) +set( CMAKE_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELEASE}" ) +set( CMAKE_C_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}" ) +set( CMAKE_CXX_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_DEBUG}" ) +set( CMAKE_C_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" ) +set( CMAKE_MODULE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" ) +set( CMAKE_EXE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" ) + +if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" ) + set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" ) + set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" ) + set( CMAKE_EXE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" ) +endif() + +# pie/pic +if( NOT (ANDROID_NATIVE_API_LEVEL LESS 16) AND (NOT DEFINED ANDROID_APP_PIE OR ANDROID_APP_PIE) AND (CMAKE_VERSION VERSION_GREATER 2.8.8) ) + set( CMAKE_POSITION_INDEPENDENT_CODE TRUE ) + set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie") +else() + set( CMAKE_POSITION_INDEPENDENT_CODE FALSE ) + set( CMAKE_CXX_FLAGS "-fpic ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-fpic ${CMAKE_C_FLAGS}" ) +endif() + +# configure rtti +if( DEFINED ANDROID_RTTI AND ANDROID_STL_FORCE_FEATURES ) + if( ANDROID_RTTI ) + set( CMAKE_CXX_FLAGS "-frtti ${CMAKE_CXX_FLAGS}" ) + else() + set( CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}" ) + endif() +endif() + +# configure exceptios +if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES ) + if( ANDROID_EXCEPTIONS ) + set( CMAKE_CXX_FLAGS "-fexceptions ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-fexceptions ${CMAKE_C_FLAGS}" ) + else() + set( CMAKE_CXX_FLAGS "-fno-exceptions ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-fno-exceptions ${CMAKE_C_FLAGS}" ) + endif() +endif() + +# global includes and link directories +include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} ) +get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning +link_directories( "${__android_install_path}" ) + +# detect if need link crtbegin_so.o explicitly +if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK ) + set( __cmd "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" ) + string( REPLACE "" "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" __cmd "${__cmd}" ) + string( REPLACE "" "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" __cmd "${__cmd}" ) + string( REPLACE "" "${CMAKE_CXX_FLAGS}" __cmd "${__cmd}" ) + string( REPLACE "" "" __cmd "${__cmd}" ) + string( REPLACE "" "${CMAKE_SHARED_LINKER_FLAGS}" __cmd "${__cmd}" ) + string( REPLACE "" "-shared" __cmd "${__cmd}" ) + string( REPLACE "" "" __cmd "${__cmd}" ) + string( REPLACE "" "" __cmd "${__cmd}" ) + string( REPLACE "" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain_crtlink_test.so" __cmd "${__cmd}" ) + string( REPLACE "" "\"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" __cmd "${__cmd}" ) + string( REPLACE "" "" __cmd "${__cmd}" ) + separate_arguments( __cmd ) + foreach( __var ANDROID_NDK ANDROID_NDK_TOOLCHAINS_PATH ANDROID_STANDALONE_TOOLCHAIN ) + if( ${__var} ) + set( __tmp "${${__var}}" ) + separate_arguments( __tmp ) + string( REPLACE "${__tmp}" "${${__var}}" __cmd "${__cmd}") + endif() + endforeach() + string( REPLACE "'" "" __cmd "${__cmd}" ) + string( REPLACE "\"" "" __cmd "${__cmd}" ) + execute_process( COMMAND ${__cmd} RESULT_VARIABLE __cmd_result OUTPUT_QUIET ERROR_QUIET ) + if( __cmd_result EQUAL 0 ) + set( ANDROID_EXPLICIT_CRT_LINK ON ) + else() + set( ANDROID_EXPLICIT_CRT_LINK OFF ) + endif() +endif() + +if( ANDROID_EXPLICIT_CRT_LINK ) + set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" ) + set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" ) +endif() + +# setup output directories +set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) + +if( DEFINED LIBRARY_OUTPUT_PATH_ROOT + OR EXISTS "${CMAKE_SOURCE_DIR}/AndroidManifest.xml" + OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") ) + set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" ) + if( NOT _CMAKE_IN_TRY_COMPILE ) + if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) + set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) + else() + set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) + endif() + set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for Android libs" ) + endif() +endif() + +# copy shaed stl library to build directory +if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" AND DEFINED LIBRARY_OUTPUT_PATH ) + get_filename_component( __libstlname "${__libstl}" NAME ) + execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) + if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") + message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) + endif() + unset( __fileCopyProcess ) + unset( __libstlname ) +endif() + + +# set these global flags for cmake client scripts to change behavior +set( ANDROID True ) +set( BUILD_ANDROID True ) + +# where is the target environment +set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_ROOT}/bin" "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" "${ANDROID_SYSROOT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" ) + +# only search for libraries and includes in the ndk toolchain +set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) +set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) +set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) + + +# macro to find packages on the host OS +macro( find_host_package ) + set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) + set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER ) + set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER ) + if( CMAKE_HOST_WIN32 ) + SET( WIN32 1 ) + SET( UNIX ) + elseif( CMAKE_HOST_APPLE ) + SET( APPLE 1 ) + SET( UNIX ) + endif() + find_package( ${ARGN} ) + SET( WIN32 ) + SET( APPLE ) + SET( UNIX 1 ) + set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) + set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) + set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) +endmacro() + + +# macro to find programs on the host OS +macro( find_host_program ) + set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) + set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER ) + set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER ) + if( CMAKE_HOST_WIN32 ) + SET( WIN32 1 ) + SET( UNIX ) + elseif( CMAKE_HOST_APPLE ) + SET( APPLE 1 ) + SET( UNIX ) + endif() + find_program( ${ARGN} ) + SET( WIN32 ) + SET( APPLE ) + SET( UNIX 1 ) + set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) + set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) + set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) +endmacro() + + +# export toolchain settings for the try_compile() command +if( NOT _CMAKE_IN_TRY_COMPILE ) + set( __toolchain_config "") + foreach( __var NDK_CCACHE LIBRARY_OUTPUT_PATH_ROOT ANDROID_FORBID_SYGWIN + ANDROID_NDK_HOST_X64 + ANDROID_NDK + ANDROID_NDK_LAYOUT + ANDROID_STANDALONE_TOOLCHAIN + ANDROID_TOOLCHAIN_NAME + ANDROID_ABI + ANDROID_NATIVE_API_LEVEL + ANDROID_STL + ANDROID_STL_FORCE_FEATURES + ANDROID_FORCE_ARM_BUILD + ANDROID_NO_UNDEFINED + ANDROID_SO_UNDEFINED + ANDROID_FUNCTION_LEVEL_LINKING + ANDROID_GOLD_LINKER + ANDROID_NOEXECSTACK + ANDROID_RELRO + ANDROID_LIBM_PATH + ANDROID_EXPLICIT_CRT_LINK + ANDROID_APP_PIE + ) + if( DEFINED ${__var} ) + if( ${__var} MATCHES " ") + set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" ) + else() + set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" ) + endif() + endif() + endforeach() + file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/android.toolchain.config.cmake" "${__toolchain_config}" ) + unset( __toolchain_config ) +endif() + + +# force cmake to produce / instead of \ in build commands for Ninja generator +if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 ) + # it is a bad hack after all + # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW + set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW + set( CMAKE_CROSSCOMPILING TRUE ) # stop recursion + enable_language( C ) + enable_language( CXX ) + # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it + unset( MINGW ) +endif() + + +# Variables controlling behavior or set by cmake toolchain: +# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64" +# ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version) +# ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none +# ANDROID_FORBID_SYGWIN : ON/OFF +# ANDROID_NO_UNDEFINED : ON/OFF +# ANDROID_SO_UNDEFINED : OFF/ON (default depends on NDK version) +# ANDROID_FUNCTION_LEVEL_LINKING : ON/OFF +# ANDROID_GOLD_LINKER : ON/OFF +# ANDROID_NOEXECSTACK : ON/OFF +# ANDROID_RELRO : ON/OFF +# ANDROID_FORCE_ARM_BUILD : ON/OFF +# ANDROID_STL_FORCE_FEATURES : ON/OFF +# ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product//obj/lib/libm.so) to workaround unresolved `sincos` +# Can be set only at the first run: +# ANDROID_NDK : path to your NDK install +# NDK_CCACHE : path to your ccache executable +# ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain +# ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems) +# ANDROID_NDK_LAYOUT : the inner NDK structure (RELEASE, LINARO, ANDROID) +# LIBRARY_OUTPUT_PATH_ROOT : +# ANDROID_STANDALONE_TOOLCHAIN +# +# Primary read-only variables: +# ANDROID : always TRUE +# ARMEABI : TRUE for arm v6 and older devices +# ARMEABI_V6 : TRUE for arm v6 +# ARMEABI_V7A : TRUE for arm v7a +# ARM64_V8A : TRUE for arm64-v8a +# NEON : TRUE if NEON unit is enabled +# VFPV3 : TRUE if VFP version 3 is enabled +# X86 : TRUE if configured for x86 +# X86_64 : TRUE if configured for x86_64 +# MIPS : TRUE if configured for mips +# MIPS64 : TRUE if configured for mips64 +# BUILD_WITH_ANDROID_NDK : TRUE if NDK is used +# BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used +# ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform +# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI +# ANDROID_NDK_RELEASE : from r5 to r10d; set only for NDK +# ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor) +# ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI +# ANDROID_SYSROOT : path to the compiler sysroot +# TOOL_OS_SUFFIX : "" or ".exe" depending on host platform +# ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used +# +# Secondary (less stable) read-only variables: +# ANDROID_COMPILER_VERSION : GCC version used (not Clang version) +# ANDROID_CLANG_VERSION : version of clang compiler if clang is used +# ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform +# ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI +# ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux" +# ANDROID_TOOLCHAIN_ROOT : path to the top level of toolchain (standalone or placed inside NDK) +# ANDROID_CLANG_TOOLCHAIN_ROOT : path to clang tools +# ANDROID_SUPPORTED_NATIVE_API_LEVELS : list of native API levels found inside NDK +# ANDROID_STL_INCLUDE_DIRS : stl include paths +# ANDROID_RTTI : if rtti is enabled by the runtime +# ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime +# ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used +# +# Defaults: +# ANDROID_DEFAULT_NDK_API_LEVEL +# ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH} +# ANDROID_NDK_SEARCH_PATHS +# ANDROID_SUPPORTED_ABIS_${ARCH} +# ANDROID_SUPPORTED_NDK_VERSIONS diff --git a/NvCloth/Externals/CMakeModules/android/ndk_links.md b/NvCloth/Externals/CMakeModules/android/ndk_links.md new file mode 100644 index 0000000..6d93d61 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/android/ndk_links.md @@ -0,0 +1,211 @@ + +============== r1 ============== (dead links) + +* http://dl.google.com/android/ndk/android-ndk-1.5_r1-windows.zip +* http://dl.google.com/android/ndk/android-ndk-1.5_r1-darwin-x86.zip +* http://dl.google.com/android/ndk/android-ndk-1.5_r1-linux-x86.zip + +============== r2 ============== + +* http://dl.google.com/android/ndk/android-ndk-1.6_r1-windows.zip +* http://dl.google.com/android/ndk/android-ndk-1.6_r1-darwin-x86.zip +* http://dl.google.com/android/ndk/android-ndk-1.6_r1-linux-x86.zip + +============== r3 ============== + +* http://dl.google.com/android/ndk/android-ndk-r3-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r3-darwin-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r3-linux-x86.zip + +============== r4 ============== + +* http://dl.google.com/android/ndk/android-ndk-r4-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r4-darwin-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r4-linux-x86.zip + +============== r4b ============== + +* http://dl.google.com/android/ndk/android-ndk-r4b-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r4b-darwin-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r4b-linux-x86.zip + +============== r5 ============== + +* http://dl.google.com/android/ndk/android-ndk-r5-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r5-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r5-linux-x86.tar.bz2 + +============== r5b ============== + +* http://dl.google.com/android/ndk/android-ndk-r5b-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r5b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r5b-linux-x86.tar.bz2 + +============== r5c ============== + +* http://dl.google.com/android/ndk/android-ndk-r5c-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r5c-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r5c-linux-x86.tar.bz2 + +============== r6 ============== + +* http://dl.google.com/android/ndk/android-ndk-r6-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r6-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r6-linux-x86.tar.bz2 + +============== r6b ============== + +* http://dl.google.com/android/ndk/android-ndk-r6b-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r6b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r6b-linux-x86.tar.bz2 + +============== r7 ============== + +* http://dl.google.com/android/ndk/android-ndk-r7-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r7-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r7-linux-x86.tar.bz2 + +============== r7b ============== + +* http://dl.google.com/android/ndk/android-ndk-r7b-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r7b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r7b-linux-x86.tar.bz2 + +============== r7c ============== + +* http://dl.google.com/android/ndk/android-ndk-r7c-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r7c-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r7c-linux-x86.tar.bz2 + +============== r8 ============== + +* http://dl.google.com/android/ndk/android-ndk-r8-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r8-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8-linux-x86.tar.bz2 + +============== r8b ============== + +* http://dl.google.com/android/ndk/android-ndk-r8b-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r8b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8b-linux-x86.tar.bz2 + +============== r8c ============== + +* http://dl.google.com/android/ndk/android-ndk-r8c-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r8c-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8c-linux-x86.tar.bz2 + +============== r8d ============== + +* http://dl.google.com/android/ndk/android-ndk-r8d-windows.zip +* http://dl.google.com/android/ndk/android-ndk-r8d-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8d-linux-x86.tar.bz2 + +============== r8e ============== + +* http://dl.google.com/android/ndk/android-ndk-r8e-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r8e-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk-r8e-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8e-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8e-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r8e-linux-x86_64.tar.bz2 + +============== r9 ============== + +* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86-legacy-toolchains.zip +* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk-r9-windows-x86_64-legacy-toolchains.zip +* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86-legacy-toolchains.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-darwin-x86_64-legacy-toolchains.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 + +============== r9b ============== + +* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86-legacy-toolchains.zip +* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk-r9b-windows-x86_64-legacy-toolchains.zip +* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86-legacy-toolchains.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-darwin-x86_64-legacy-toolchains.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 + +============== r9c ============== + +* http://dl.google.com/android/ndk/android-ndk-r9c-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r9c-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk-r9c-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9c-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9c-cxx-stl-libs-with-debugging-info.zip + +============== r9d ============== + +* http://dl.google.com/android/ndk/android-ndk-r9d-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk-r9d-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9d-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9d-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r9d-cxx-stl-libs-with-debug-info.zip + +============== r10 ============== + +* http://dl.google.com/android/ndk/android-ndk32-r10-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk32-r10-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk32-r10-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk32-r10-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk64-r10-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk64-r10-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r10-cxx-stl-libs-with-debug-info.zip + +============== r10b ============== + +* http://dl.google.com/android/ndk/android-ndk32-r10b-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk32-r10b-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10b-windows-x86.zip +* http://dl.google.com/android/ndk/android-ndk64-r10b-windows-x86_64.zip +* http://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86_64.tar.bz2 +* http://dl.google.com/android/ndk/android-ndk-r10b-cxx-stl-libs-with-debug-info.zip + +============== r10c ============== + +* http://dl.google.com/android/ndk/android-ndk-r10c-windows-x86.exe +* http://dl.google.com/android/ndk/android-ndk-r10c-windows-x86_64.exe +* http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86.bin +* http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin +* http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86.bin +* http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin + +============== r10d ============== + +* http://dl.google.com/android/ndk/android-ndk-r10d-windows-x86.exe +* http://dl.google.com/android/ndk/android-ndk-r10d-windows-x86_64.exe +* http://dl.google.com/android/ndk/android-ndk-r10d-darwin-x86.bin +* http://dl.google.com/android/ndk/android-ndk-r10d-darwin-x86_64.bin +* http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin +* http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin diff --git a/NvCloth/Externals/CMakeModules/ios/ios.toolchain.cmake b/NvCloth/Externals/CMakeModules/ios/ios.toolchain.cmake new file mode 100644 index 0000000..1f6ed45 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/ios/ios.toolchain.cmake @@ -0,0 +1,334 @@ +# This file is part of the ios-cmake project. It was retrieved from +# https://github.com/cristeab/ios-cmake.git, which is a fork of +# https://code.google.com/p/ios-cmake/. Which in turn is based off of +# the Platform/Darwin.cmake and Platform/UnixPaths.cmake files which +# are included with CMake 2.8.4 +# +# The ios-cmake project is licensed under the new BSD license. +# +# Copyright (c) 2014, Bogdan Cristea and LTE Engineering Software, +# Kitware, Inc., Insight Software Consortium. All rights reserved. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# This file is based off of the Platform/Darwin.cmake and +# Platform/UnixPaths.cmake files which are included with CMake 2.8.4 +# It has been altered for iOS development. +# +# Updated by Alex Stewart (alexs.mac@gmail.com). +# The following variables control the behaviour of this toolchain: +# +# IOS_PLATFORM: OS (default) or SIMULATOR or SIMULATOR64 +# OS = Build for iPhoneOS. +# SIMULATOR = Build for x86 i386 iPhone Simulator. +# SIMULATOR64 = Build for x86 x86_64 iPhone Simulator. +# CMAKE_OSX_SYSROOT: Path to the iOS SDK to use. By default this is +# automatically determined from IOS_PLATFORM and xcodebuild, but +# can also be manually specified (although this should not be required). +# CMAKE_IOS_DEVELOPER_ROOT: Path to the Developer directory for the iOS platform +# being compiled for. By default this is automatically determined from +# CMAKE_OSX_SYSROOT, but can also be manually specified (although this should +# not be required). +# ENABLE_BITCODE: (true|false) Enables or disables bitcode support. Default true +# +# This toolchain defines the following variables for use externally: +# +# XCODE_VERSION: Version number (not including Build version) of Xcode detected. +# IOS_SDK_VERSION: Version of iOS SDK being used. +# CMAKE_OSX_ARCHITECTURES: Architectures being compiled for (generated from +# IOS_PLATFORM). +# +# This toolchain defines the following macros for use externally: +# +# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE XCODE_VARIANT) +# A convenience macro for setting xcode specific properties on targets. +# Available variants are: All, Release, RelWithDebInfo, Debug, MinSizeRel +# example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1" "all"). +# +# find_host_package (PROGRAM ARGS) +# A macro used to find executable programs on the host system, not within the +# iOS environment. Thanks to the android-cmake project for providing the +# command. + +# Fix for PThread library not in path +set(CMAKE_THREAD_LIBS_INIT "-lpthread") +set(CMAKE_HAVE_THREADS_LIBRARY 1) +set(CMAKE_USE_WIN32_THREADS_INIT 0) +set(CMAKE_USE_PTHREADS_INIT 1) + +# Get the Xcode version being used. +execute_process(COMMAND xcodebuild -version + OUTPUT_VARIABLE XCODE_VERSION + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +string(REGEX MATCH "Xcode [0-9\\.]+" XCODE_VERSION "${XCODE_VERSION}") +string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" XCODE_VERSION "${XCODE_VERSION}") +message(STATUS "Building with Xcode version: ${XCODE_VERSION}") +# Default to building for iPhoneOS if not specified otherwise, and we cannot +# determine the platform from the CMAKE_OSX_ARCHITECTURES variable. The use +# of CMAKE_OSX_ARCHITECTURES is such that try_compile() projects can correctly +# determine the value of IOS_PLATFORM from the root project, as +# CMAKE_OSX_ARCHITECTURES is propagated to them by CMake. +if (NOT DEFINED IOS_PLATFORM) + if (CMAKE_OSX_ARCHITECTURES) + if (CMAKE_OSX_ARCHITECTURES MATCHES ".*arm.*") + set(IOS_PLATFORM "OS") + elseif (CMAKE_OSX_ARCHITECTURES MATCHES "i386") + set(IOS_PLATFORM "SIMULATOR") + elseif (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") + set(IOS_PLATFORM "SIMULATOR64") + endif() + endif() + if (NOT IOS_PLATFORM) + set(IOS_PLATFORM "OS") + endif() +endif() +set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING + "Type of iOS platform for which to build.") +# Determine the platform name and architectures for use in xcodebuild commands +# from the specified IOS_PLATFORM name. +if (IOS_PLATFORM STREQUAL "OS") + set(XCODE_IOS_PLATFORM iphoneos) + set(IOS_ARCH armv7 armv7s arm64) +elseif (IOS_PLATFORM STREQUAL "SIMULATOR") + set(XCODE_IOS_PLATFORM iphonesimulator) + set(IOS_ARCH i386) +elseif(IOS_PLATFORM STREQUAL "SIMULATOR64") + set(XCODE_IOS_PLATFORM iphonesimulator) + set(IOS_ARCH x86_64) +else() + message(FATAL_ERROR "Invalid IOS_PLATFORM: ${IOS_PLATFORM}") +endif() +message(STATUS "Configuring iOS build for platform: ${IOS_PLATFORM}, " + "architecture(s): ${IOS_ARCH}") +# If user did not specify the SDK root to use, then query xcodebuild for it. +if (NOT CMAKE_OSX_SYSROOT) + execute_process(COMMAND xcodebuild -version -sdk ${XCODE_IOS_PLATFORM} Path + OUTPUT_VARIABLE CMAKE_OSX_SYSROOT + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "Using SDK: ${CMAKE_OSX_SYSROOT} for platform: ${IOS_PLATFORM}") +endif() +if (NOT EXISTS ${CMAKE_OSX_SYSROOT}) + message(FATAL_ERROR "Invalid CMAKE_OSX_SYSROOT: ${CMAKE_OSX_SYSROOT} " + "does not exist.") +endif() +# Specify minimum version of deployment target. +if (NOT DEFINED IOS_DEPLOYMENT_TARGET) + # Unless specified, SDK version 8.0 is used by default as minimum target version. + set(IOS_DEPLOYMENT_TARGET "8.0" + CACHE STRING "Minimum iOS version to build for." ) + message(STATUS "Using the default min-version since IOS_DEPLOYMENT_TARGET not provided!") +endif() +# Use bitcode or not +if (NOT DEFINED ENABLE_BITCODE) + # Unless specified, enable bitcode support by default + set(ENABLE_BITCODE FALSE CACHE BOOL "Wheter or not to enable bitcode") + message(STATUS "Disabling bitcode support by default. ENABLE_BITCODE not provided!") +endif() +# Get the SDK version information. +execute_process(COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version SDKVersion + OUTPUT_VARIABLE IOS_SDK_VERSION + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +# Find the Developer root for the specific iOS platform being compiled for +# from CMAKE_OSX_SYSROOT. Should be ../../ from SDK specified in +# CMAKE_OSX_SYSROOT. There does not appear to be a direct way to obtain +# this information from xcrun or xcodebuild. +if (NOT CMAKE_IOS_DEVELOPER_ROOT) + get_filename_component(IOS_PLATFORM_SDK_DIR ${CMAKE_OSX_SYSROOT} PATH) + get_filename_component(CMAKE_IOS_DEVELOPER_ROOT ${IOS_PLATFORM_SDK_DIR} PATH) +endif() +if (NOT EXISTS ${CMAKE_IOS_DEVELOPER_ROOT}) + message(FATAL_ERROR "Invalid CMAKE_IOS_DEVELOPER_ROOT: " + "${CMAKE_IOS_DEVELOPER_ROOT} does not exist.") +endif() +message("CMAKE_IOS_DEVELOPER_ROOT: ${CMAKE_IOS_DEVELOPER_ROOT}") +# Find the C & C++ compilers for the specified SDK. +if (NOT CMAKE_C_COMPILER) + execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang + OUTPUT_VARIABLE CMAKE_C_COMPILER + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "Using C compiler: ${CMAKE_C_COMPILER}") +endif() +if (NOT CMAKE_CXX_COMPILER) + execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang++ + OUTPUT_VARIABLE CMAKE_CXX_COMPILER + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "Using CXX compiler: ${CMAKE_CXX_COMPILER}") +endif() +# Find (Apple's) libtool. +execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find libtool + OUTPUT_VARIABLE IOS_LIBTOOL + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +message(STATUS "Using libtool: ${IOS_LIBTOOL}") +# Configure libtool to be used instead of ar + ranlib to build static libraries. +# This is required on Xcode 7+, but should also work on previous versions of +# Xcode. +set(CMAKE_C_CREATE_STATIC_LIBRARY + "${IOS_LIBTOOL} -static -o ") +set(CMAKE_CXX_CREATE_STATIC_LIBRARY + "${IOS_LIBTOOL} -static -o ") +# Get the version of Darwin (OS X) of the host. +execute_process(COMMAND uname -r + OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +# Standard settings. +set(CMAKE_SYSTEM_NAME Darwin CACHE INTERNAL "") +set(CMAKE_SYSTEM_VERSION ${IOS_SDK_VERSION} CACHE INTERNAL "") +set(UNIX TRUE CACHE BOOL "") +set(APPLE TRUE CACHE BOOL "") +set(IOS TRUE CACHE BOOL "") +set(CMAKE_AR ar CACHE FILEPATH "" FORCE) +set(CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE) +# Force unset of OS X-specific deployment target (otherwise autopopulated), +# required as of cmake 2.8.10. +set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING + "Must be empty for iOS builds." FORCE) +# Set the architectures for which to build. +set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE STRING "Build architecture for iOS") +# Skip the platform compiler checks for cross compiling. +set(CMAKE_CXX_COMPILER_FORCED TRUE) +set(CMAKE_CXX_COMPILER_WORKS TRUE) +set(CMAKE_C_COMPILER_FORCED TRUE) +set(CMAKE_C_COMPILER_WORKS TRUE) +# All iOS/Darwin specific settings - some may be redundant. +set(CMAKE_SHARED_LIBRARY_PREFIX "lib") +set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") +set(CMAKE_SHARED_MODULE_PREFIX "lib") +set(CMAKE_SHARED_MODULE_SUFFIX ".so") +set(CMAKE_MODULE_EXISTS 1) +set(CMAKE_DL_LIBS "") +set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") +set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ") +set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}") +set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") +message(STATUS "Building for minimum iOS version: ${IOS_DEPLOYMENT_TARGET}" + " (SDK version: ${IOS_SDK_VERSION})") +# Note that only Xcode 7+ supports the newer more specific: +# -m${XCODE_IOS_PLATFORM}-version-min flags, older versions of Xcode use: +# -m(ios/ios-simulator)-version-min instead. +if (IOS_PLATFORM STREQUAL "OS") + if (XCODE_VERSION VERSION_LESS 7.0) + set(XCODE_IOS_PLATFORM_VERSION_FLAGS + "-mios-version-min=${IOS_DEPLOYMENT_TARGET}") + else() + # Xcode 7.0+ uses flags we can build directly from XCODE_IOS_PLATFORM. + set(XCODE_IOS_PLATFORM_VERSION_FLAGS + "-m${XCODE_IOS_PLATFORM}-version-min=${IOS_DEPLOYMENT_TARGET}") + endif() +else() + # SIMULATOR or SIMULATOR64 both use -mios-simulator-version-min. + set(XCODE_IOS_PLATFORM_VERSION_FLAGS + "-mios-simulator-version-min=${IOS_DEPLOYMENT_TARGET}") +endif() +message(STATUS "Version flags set to: ${XCODE_IOS_PLATFORM_VERSION_FLAGS}") + +if (ENABLE_BITCODE) + set(BITCODE "-fembed-bitcode") + message(STATUS "Enabling bitcode support.") +else() + set(BITCODE "") + message(STATUS "Disabling bitcode support.") +endif() + +set(CMAKE_C_FLAGS +"${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fobjc-abi-version=2 -fobjc-arc ${CMAKE_C_FLAGS}") +# Hidden visibilty is required for C++ on iOS. +set(CMAKE_CXX_FLAGS + "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} ${CMAKE_CXX_FLAGS}") +set(CMAKE_CXX_FLAGS_RELEASE "${BITCODE} ${CMAKE_CXX_FLAGS_RELEASE}") +set(CMAKE_C_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}") +set(CMAKE_CXX_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}") +# In order to ensure that the updated compiler flags are used in try_compile() +# tests, we have to forcibly set them in the CMake cache, not merely set them +# in the local scope. +list(APPEND VARS_TO_FORCE_IN_CACHE + CMAKE_C_FLAGS + CMAKE_CXX_FLAGS + CMAKE_CXX_RELEASE + CMAKE_C_LINK_FLAGS + CMAKE_CXX_LINK_FLAGS) +foreach(VAR_TO_FORCE ${VARS_TO_FORCE_IN_CACHE}) + set(${VAR_TO_FORCE} "${${VAR_TO_FORCE}}" CACHE STRING "" FORCE) +endforeach() +set(CMAKE_PLATFORM_HAS_INSTALLNAME 1) +set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names") +set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") +set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") +set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") +set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") +# Hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old +# build tree (where install_name_tool was hardcoded) and where +# CMAKE_INSTALL_NAME_TOOL isn't in the cache and still cmake didn't fail in +# CMakeFindBinUtils.cmake (because it isn't rerun) hardcode +# CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did +# before, Alex. +if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool) +endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) +# Set the find root to the iOS developer roots and to user defined paths. +set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_OSX_SYSROOT} + ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root" FORCE) +# Default to searching for frameworks first. +set(CMAKE_FIND_FRAMEWORK FIRST) +# Set up the default search directories for frameworks. +set(CMAKE_SYSTEM_FRAMEWORK_PATH + ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks + ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks + ${CMAKE_OSX_SYSROOT}/Developer/Library/Frameworks) +# Only search the specified iOS SDK, not the remainder of the host filesystem. +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +# This little macro lets you set any XCode specific property. +macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE XCODE_RELVERSION) + set(XCODE_RELVERSION_I "${XCODE_RELVERSION}") + if (XCODE_RELVERSION_I STREQUAL "All") + set_property(TARGET ${TARGET} PROPERTY + XCODE_ATTRIBUTE_${XCODE_PROPERTY} "${XCODE_VALUE}") + else() + set_property(TARGET ${TARGET} PROPERTY + XCODE_ATTRIBUTE_${XCODE_PROPERTY}[variant=${XCODE_RELVERSION_I}] "${XCODE_VALUE}") + endif() +endmacro(set_xcode_property) +# This macro lets you find executable programs on the host system. +macro(find_host_package) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) + set(IOS FALSE) + find_package(${ARGN}) + set(IOS TRUE) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endmacro(find_host_package) diff --git a/NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake b/NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake new file mode 100644 index 0000000..cfe2d64 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake @@ -0,0 +1,37 @@ +IF(NOT $ENV{LINUX_ROOT} EQUAL "") + SET(CMAKE_SYSTEM_NAME Linux) + + # FIXME: fix Linux toolchains to support architectures + SET(LINUX_ROOT $ENV{UE_SDKS_ROOT}/HostWin64/Linux_x64/arm-unknown-linux-gnueabihf_v5_clang-3.5.0-ld-2.23.1-glibc-2.13/toolchain) + STRING(REGEX REPLACE "\\\\" "/" LINUX_ROOT ${LINUX_ROOT}) + + message (STATUS "LINUX_ROOT is '${LINUX_ROOT}'") + SET(ARCHITECTURE_TRIPLE arm-unknown-linux-gnueabihf) + + SET(CMAKE_CROSSCOMPILING TRUE) + SET(CMAKE_SYSTEM_NAME Linux) + SET(CMAKE_SYSTEM_VERSION 1) + + # sysroot + SET(CMAKE_SYSROOT ${LINUX_ROOT}) + + SET(CMAKE_LIBRARY_ARCHITECTURE ${ARCHITECTURE_TRIPLE}) + + # specify the cross compiler + SET(CMAKE_C_COMPILER ${CMAKE_SYSROOT}/bin/clang.exe) + SET(CMAKE_C_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) + SET(CMAKE_C_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") + + SET(CMAKE_CXX_COMPILER ${CMAKE_SYSROOT}/bin/clang++.exe) + SET(CMAKE_CXX_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) + SET(CMAKE_CXX_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") + + SET(CMAKE_FIND_ROOT_PATH ${LINUX_ROOT}) + #set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) # hoping to force it to use ar + #set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + #set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +ELSE() + MESSAGE("LINUX_ROOT environment variable not defined!") +ENDIF() + + diff --git a/NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake b/NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake new file mode 100644 index 0000000..a82d145 --- /dev/null +++ b/NvCloth/Externals/CMakeModules/linux/LinuxCrossToolchain.x86_64-unknown-linux-gnu.cmake @@ -0,0 +1,36 @@ +IF(NOT $ENV{LINUX_ROOT} EQUAL "") + SET(CMAKE_SYSTEM_NAME Linux) + + SET(LINUX_ROOT $ENV{LINUX_ROOT}) + STRING(REGEX REPLACE "\\\\" "/" LINUX_ROOT ${LINUX_ROOT}) + + message (STATUS "LINUX_ROOT is '${LINUX_ROOT}'") + SET(ARCHITECTURE_TRIPLE x86_64-unknown-linux-gnu) + + SET(CMAKE_CROSSCOMPILING TRUE) + SET(CMAKE_SYSTEM_NAME Linux) + SET(CMAKE_SYSTEM_VERSION 1) + + # sysroot + SET(CMAKE_SYSROOT ${LINUX_ROOT}) + + SET(CMAKE_LIBRARY_ARCHITECTURE ${ARCHITECTURE_TRIPLE}) + + # specify the cross compiler + SET(CMAKE_C_COMPILER ${CMAKE_SYSROOT}/bin/clang.exe) + SET(CMAKE_C_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) + SET(CMAKE_C_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") + + SET(CMAKE_CXX_COMPILER ${CMAKE_SYSROOT}/bin/clang++.exe) + SET(CMAKE_CXX_COMPILER_TARGET ${ARCHITECTURE_TRIPLE}) + SET(CMAKE_CXX_FLAGS "-target ${ARCHITECTURE_TRIPLE} --sysroot ${LINUX_ROOT} ") + + SET(CMAKE_FIND_ROOT_PATH ${LINUX_ROOT}) + #set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) # hoping to force it to use ar + #set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + #set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +ELSE() + MESSAGE("LINUX_ROOT environment variable not defined!") +ENDIF() + + diff --git a/NvCloth/FindNvCloth.cmake b/NvCloth/FindNvCloth.cmake index e9966a3..6ffb0a9 100644 --- a/NvCloth/FindNvCloth.cmake +++ b/NvCloth/FindNvCloth.cmake @@ -7,7 +7,7 @@ FIND_PATH( NVCLOTH_ROOT_DIR include/NvCloth/Fabric.h HINTS ${GW_DEPS_ROOT}/NvCloth - ${GW_DEPS_ROOT}/sw/devrel/libdev/NvCloth/trunk + ${GW_DEPS_ROOT}/sw/devrel/libdev/NvCloth/trunk/NvCloth NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) diff --git a/NvCloth/GenerateProjectsIOS.sh b/NvCloth/GenerateProjectsIOS.sh index aebcb18..d4acdbe 100644 --- a/NvCloth/GenerateProjectsIOS.sh +++ b/NvCloth/GenerateProjectsIOS.sh @@ -2,12 +2,8 @@ # Make sure the various variables that we need are set -export GW_DEPS_ROOT="$PWD""/../../../../../" - -if [ -e $PWD"/../Externals/CMakeModules" ]; then - export GW_DEPS_ROOT="$PWD""/../../" -fi - +export GW_DEPS_ROOT="$PWD""/../" + [ -z "$GW_DEPS_ROOT" ] && echo "GW_DEPS_ROOT not defined." && exit 1; @@ -30,7 +26,7 @@ export USE_CUDA=0 rm -r -f compiler/ios-cmake/ mkdir compiler/ios-cmake/ cd compiler/ios-cmake/ -$CMAKE ../cmake/ios -G Xcode -DCMAKE_TOOLCHAIN_FILE=$GW_DEPS_ROOT/sw/physx/tools/CMakeModules/ios/ios.toolchain.cmake -DTARGET_BUILD_PLATFORM=ios -DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET="8.0" -DNV_CLOTH_ENABLE_CUDA=$USE_CUDA -DUSE_CUDA=$USE_CUDA -DPX_GENERATE_GPU_PROJECTS=0 -DPX_OUTPUT_DLL_DIR=$PX_OUTPUT_ROOT/bin/ios-cmake -DPX_OUTPUT_LIB_DIR=$PX_OUTPUT_ROOT/lib/ios-cmake -DPX_OUTPUT_EXE_DIR=$PX_OUTPUT_ROOT/bin/ios-cmake || exit 1 +$CMAKE ../cmake/ios -G Xcode -DCMAKE_TOOLCHAIN_FILE=$GW_DEPS_ROOT/NvCloth/Externals/CMakeModules/ios/ios.toolchain.cmake -DTARGET_BUILD_PLATFORM=ios -DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET="8.0" -DNV_CLOTH_ENABLE_CUDA=$USE_CUDA -DUSE_CUDA=$USE_CUDA -DPX_GENERATE_GPU_PROJECTS=0 -DPX_OUTPUT_DLL_DIR=$PX_OUTPUT_ROOT/bin/ios-cmake -DPX_OUTPUT_LIB_DIR=$PX_OUTPUT_ROOT/lib/ios-cmake -DPX_OUTPUT_EXE_DIR=$PX_OUTPUT_ROOT/bin/ios-cmake || exit 1 cd ../../ diff --git a/NvCloth/GenerateProjectsLinux.sh b/NvCloth/GenerateProjectsLinux.sh index 72bbdda..3be88ac 100644 --- a/NvCloth/GenerateProjectsLinux.sh +++ b/NvCloth/GenerateProjectsLinux.sh @@ -2,11 +2,7 @@ # Make sure the various variables that we need are set -export GW_DEPS_ROOT="$PWD""/../../../../../" - -if [ -e $PWD"/../Externals/CMakeModules" ]; then - export GW_DEPS_ROOT="$PWD""/../" -fi +export GW_DEPS_ROOT="$PWD""/../" [ -z "$GW_DEPS_ROOT" ] && echo "GW_DEPS_ROOT not defined." && exit 1; diff --git a/NvCloth/GenerateProjectsOsx.sh b/NvCloth/GenerateProjectsOsx.sh index c52e781..7dc9b40 100644 --- a/NvCloth/GenerateProjectsOsx.sh +++ b/NvCloth/GenerateProjectsOsx.sh @@ -2,11 +2,7 @@ # Make sure the various variables that we need are set -export GW_DEPS_ROOT="$PWD""/../../../../../" - -if [ -e $PWD"/../Externals/CMakeModules" ]; then - export GW_DEPS_ROOT="$PWD""/../../" -fi +export GW_DEPS_ROOT="$PWD""/../" [ -z "$GW_DEPS_ROOT" ] && echo "GW_DEPS_ROOT not defined." && exit 1; @@ -27,12 +23,6 @@ export USE_CUDA=0 # Generate projects here -rm -r -f compiler/osx32-cmake/ -mkdir compiler/osx32-cmake/ -cd compiler/osx32-cmake/ -$CMAKE ../cmake/mac -G Xcode -DTARGET_BUILD_PLATFORM=mac -DCMAKE_OSX_ARCHITECTURES=i386 -DPX_32BIT=1 -DNV_CLOTH_ENABLE_CUDA=$USE_CUDA -DUSE_CUDA=$USE_CUDA -DPX_GENERATE_GPU_PROJECTS=0 -DPX_OUTPUT_DLL_DIR=$PX_OUTPUT_ROOT/bin/osx32-cmake -DPX_OUTPUT_LIB_DIR=$PX_OUTPUT_ROOT/lib/osx32-cmake -DPX_OUTPUT_EXE_DIR=$PX_OUTPUT_ROOT/bin/osx32-cmake || exit 1 -cd ../../ - rm -r -f compiler/osx64-cmake/ mkdir compiler/osx64-cmake/ cd compiler/osx64-cmake/ diff --git a/NvCloth/ReleaseNotes.txt b/NvCloth/ReleaseNotes.txt index 8cc2163..4ee4d78 100644 --- a/NvCloth/ReleaseNotes.txt +++ b/NvCloth/ReleaseNotes.txt @@ -4,31 +4,43 @@ NvCloth Release notes. Release Notes *************************** -1.1.5 +1.1.6 =========================================================================================== -Supported platforms: +Compatible platforms: * Windows (CPU, CUDA, DX11) * Mac (tested on Sierra) -* iOS (tested on iOS 11) * Linux (tested on Ubuntu 16.04.1 LTS x64) -* PlayStation 4 with PS4 SDK 4.5 -* Xbox one (CPU, DX11, beta) +* PlayStation 4 with PS4 SDK 6.5 +* Xbox one (CPU, DX11) * Android (arm64-v8a, API >= 21), tested on Shield TV -* Switch (SDK 3.5.0) +* Switch (SDK 8.0.0) -Supported compilers (via cmake 3.7) +Compatible compilers (via cmake 3.7) * Windows: Visual Studio 12, 14 (2013, 2015) * Linux: gcc 5.4 (only x64) -* Mac: xcode -* iOS: tested with XCode 9 (Apple LLVM) +* Mac: XCode 10.1 +* iOS: tested with XCode 10.1 (Apple LLVM) * PlayStation 4: Visual studio 14 (2015) * Xbox one: Visual studio 14 (2015) -* Android: NDK r12b and above +* Android: NDK r15c * Switch: Visual studio 14 (2015) +Fixed: + +- Now compatible with the same PxShared version as PhysX 4.0 + +New: +- New setPlanes and setSpheres API. + +Known issues: +- None + +1.1.5 +=========================================================================================== + Fixed: - Wind simulation code could affect particle masses (especially when high drag/lift coefficients were used) diff --git a/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt b/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt index e9702e3..dcb583a 100644 --- a/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt +++ b/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt @@ -4,6 +4,14 @@ project(NvClothAuthoringLibrary CXX) CMAKE_POLICY(SET CMP0057 NEW) # Enable IN_LIST +SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) + +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) + + +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/../..") +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeModules") + IF(NOT DEFINED AUTHORINGLIBRARY_ROOT_DIR) STRING(REPLACE "\\" "/" BRD_TEMP $ENV{AUTHORINGLIBRARY_ROOT_DIR}) @@ -17,8 +25,6 @@ IF(NOT EXISTS ${AUTHORINGLIBRARY_ROOT_DIR}) MESSAGE(FATAL_ERROR "AUTHORINGLIBRARY_ROOT_DIR environment variable wasn't set or was invalid.") ENDIF() -SET(GW_DEPS_ROOT "${AUTHORINGLIBRARY_ROOT_DIR}/external") - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GW_DEPS_ROOT}/CMakeModules") MESSAGE("AUTHORINGLIBRARY_ROOT_DIR:" ${AUTHORINGLIBRARY_ROOT_DIR}) diff --git a/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat b/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat index e3a297c..7b51db9 100644 --- a/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat +++ b/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat @@ -1,8 +1,10 @@ CD /D %~dp0 +set GW_DEPS_ROOT=%~dp0..\..\..\ echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally." -call "../../scripts/locate_gw_root.bat" GW_DEPS_ROOT_F -@echo on -setx GW_DEPS_ROOT "%GW_DEPS_ROOT_F% +REM single " is not a mistake +setx GW_DEPS_ROOT "%GW_DEPS_ROOT% +REM this one is for local use +set GW_DEPS_ROOT=%GW_DEPS_ROOT% echo GW_DEPS_ROOT = %GW_DEPS_ROOT% REM Install cmake using packman @@ -27,11 +29,4 @@ pushd compiler\vc14win64-cmake\ popd -rmdir /s /q compiler\vc14win32-cmake\ -mkdir compiler\vc14win32-cmake\ -pushd compiler\vc14win32-cmake\ -%CMAKE% ..\.. -G "Visual Studio 14 2015" -AWin32 -DTARGET_BUILD_PLATFORM=windows -DSTATIC_WINCRT=0 -DBL_DLL_OUTPUT_DIR=%OUTPUT_ROOT%\bin\vc14win32-cmake -DBL_LIB_OUTPUT_DIR=%OUTPUT_ROOT%\lib\vc14win32-cmake -DBL_EXE_OUTPUT_DIR=%OUTPUT_ROOT%\bin\vc14win32-cmake - -popd - pause diff --git a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake index e649116..6caab92 100644 --- a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake +++ b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake @@ -65,7 +65,6 @@ SET_TARGET_PROPERTIES(NvClothAuthoringLibrary PROPERTIES TARGET_COMPILE_OPTIONS(NvClothAuthoringLibrary PRIVATE /wd4005 /wd4244) -TARGET_LINK_LIBRARIES(NvClothAuthoringLibrary PUBLIC PxFoundation) TARGET_LINK_LIBRARIES(NvClothAuthoringLibrary PUBLIC NvCloth) SET_TARGET_PROPERTIES(NvClothAuthoringLibrary PROPERTIES LINK_FLAGS ${AUTHORINGLIBRARY_LINK_FLAGS}) diff --git a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake index 88a3dd5..5b4c180 100644 --- a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake +++ b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake @@ -29,7 +29,7 @@ if (CMAKE_CL_64) SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x64_x64)/d3dcompiler_47.dll\"") - SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) +# SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) else() SET(SHADOW_LIB ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.lib) SET(SHADOW_DLLS ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.dll) @@ -39,6 +39,6 @@ else() SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x86_x86)/d3dcompiler_47.dll\"") - SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) +# SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) endif() diff --git a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt index fd9d4bd..7670847 100644 --- a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt +++ b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt @@ -1,20 +1,5 @@ #Platform specific compile flags and project includes -SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) - -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules) - -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -ENDIF() - - -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -ENDIF() - -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/../..") -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeModules") MESSAGE("CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH}) #NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more. @@ -67,11 +52,6 @@ SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) FIND_PACKAGE(NvCloth REQUIRED) -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -#ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/windows "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") #MESSAGE("NVCLOTH_ROOT_DIR = ${NVCLOTH_ROOT_DIR}") ADD_SUBDIRECTORY(${NVCLOTH_ROOT_DIR}/compiler/cmake/windows "${CMAKE_CURRENT_BINARY_DIR}/NvCloth_bin") diff --git a/NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake b/NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake deleted file mode 100644 index c094676..0000000 --- a/NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# - Try to find PxShared -# Once done this will define -# PXSHARED_FOUND - System has PxShared -# PXSHARED_ROOT_DIR - The root of PxShared - -# NOTE: We're including a version in this, but the first hint is without one - we should use that! -FIND_PATH( PXSHARED_ROOT_DIR include/cudamanager/PxGpuCopyDesc.h - HINTS - ${GW_DEPS_ROOT}/PxShared/${PxShared_FIND_VERSION} - ${GW_DEPS_ROOT}/sw/physx/PxShared/1.0/trunk - - ) - - - - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxShared DEFAULT_MSG PXSHARED_ROOT_DIR) - -mark_as_advanced(PXSHARED_ROOT_DIR) diff --git a/NvCloth/compiler/cmake/android/CMakeLists.txt b/NvCloth/compiler/cmake/android/CMakeLists.txt index 61a6892..7ef0673 100644 --- a/NvCloth/compiler/cmake/android/CMakeLists.txt +++ b/NvCloth/compiler/cmake/android/CMakeLists.txt @@ -44,19 +44,7 @@ SET(NVCLOTH_ANDROID_RELEASE_COMPILE_DEFS NDEBUG) SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) -################################################################################ -# TODO -################################################################################ -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -#ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/android "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") -################################################################################ - # Include all of the projects INCLUDE(NvCloth.cmake) -TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation) - MESSAGE("[NvCloth]cmake/android/CMakeList.txt END") \ No newline at end of file diff --git a/NvCloth/compiler/cmake/android/NvCloth.cmake b/NvCloth/compiler/cmake/android/NvCloth.cmake index 544a3b5..8463368 100644 --- a/NvCloth/compiler/cmake/android/NvCloth.cmake +++ b/NvCloth/compiler/cmake/android/NvCloth.cmake @@ -7,6 +7,11 @@ SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) SET(NVCLOTH_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../../) SET(NVCLOTH_PLATFORM_SOURCE_FILES + ${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixAtomic.cpp + ${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixFPU.h + ${PROJECT_ROOT_DIR}/src/ps/android/cpu-features.c + ${PROJECT_ROOT_DIR}/src/ps/android/cpu-features.h + ${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp ${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp ${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp diff --git a/NvCloth/compiler/cmake/common/CMakeLists.txt b/NvCloth/compiler/cmake/common/CMakeLists.txt index eddb1d9..bbebc3f 100644 --- a/NvCloth/compiler/cmake/common/CMakeLists.txt +++ b/NvCloth/compiler/cmake/common/CMakeLists.txt @@ -8,18 +8,10 @@ CMAKE_POLICY(SET CMP0057 NEW) # Enable IN_LIST SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) -SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules) - -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -ENDIF() +SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/NvCloth/Externals/CMakeModules) MESSAGE( "[NvCloth]cmake/common CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}") -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -ENDIF() - # Add find modules to the path IF(NOT EXISTS ${CMAKE_MODULE_PATH}) MESSAGE(FATAL_ERROR "Could not find CMakeModules at ${CMAKE_MODULE_PATH}") diff --git a/NvCloth/compiler/cmake/common/NvCloth.cmake b/NvCloth/compiler/cmake/common/NvCloth.cmake index 94b7e79..8d59261 100644 --- a/NvCloth/compiler/cmake/common/NvCloth.cmake +++ b/NvCloth/compiler/cmake/common/NvCloth.cmake @@ -20,6 +20,21 @@ SET( NV_CLOTH_SOURCE_LIST ${PROJECT_ROOT_DIR}/include/NvCloth/Range.h ${PROJECT_ROOT_DIR}/include/NvCloth/Solver.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/Ps.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAtomic.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAlignedMalloc.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAllocator.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAllocator.cpp + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsArray.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsBasicTemplates.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsBitUtils.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsHash.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsHashInternals.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsHashMap.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsIntrinsics.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsUserAllocated.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsMathUtils.h + ${PROJECT_ROOT_DIR}/src/Allocator.cpp ${PROJECT_ROOT_DIR}/src/BoundingBox.h ${PROJECT_ROOT_DIR}/src/Callbacks.cpp @@ -119,6 +134,13 @@ SET( NV_CLOTH_SOURCE_LIST ${PROJECT_ROOT_DIR}/src/sse2/SwCollisionHelpers.h ${PROJECT_ROOT_DIR}/src/sse2/SwSolveConstraints.h + ${PROJECT_ROOT_DIR}/src/ps/PsAlloca.h + ${PROJECT_ROOT_DIR}/src/ps/PsFPU.h + ${PROJECT_ROOT_DIR}/src/ps/PsSort.h + ${PROJECT_ROOT_DIR}/src/ps/PsSortInternals.h + ${PROJECT_ROOT_DIR}/src/ps/PsUtilities.h + ${PROJECT_ROOT_DIR}/src/ps/PxIntrinsics.h + ${PROJECT_ROOT_DIR}/extensions/include/NvClothExt/ClothFabricCooker.h ${PROJECT_ROOT_DIR}/extensions/include/NvClothExt/ClothMeshDesc.h ${PROJECT_ROOT_DIR}/extensions/include/NvClothExt/ClothMeshQuadifier.h @@ -178,4 +200,4 @@ IF(NOT ${NVCLOTH_LIBTYPE} STREQUAL "OBJECT") COMPILE_PDB_NAME_RELEASE "NvCloth${CMAKE_RELEASE_POSTFIX}" ) ENDIF() -MESSAGE("[NvCloth]cmake/common/NvCloth.cmake END") \ No newline at end of file +MESSAGE("[NvCloth]cmake/common/NvCloth.cmake END") diff --git a/NvCloth/compiler/cmake/ios/CMakeLists.txt b/NvCloth/compiler/cmake/ios/CMakeLists.txt index c0c890e..bf36e95 100644 --- a/NvCloth/compiler/cmake/ios/CMakeLists.txt +++ b/NvCloth/compiler/cmake/ios/CMakeLists.txt @@ -13,7 +13,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST) MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM}) ENDIF() -SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral -Wno-undef -Wno-double-promotion") +SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral -Wno-undef -Wno-double-promotion -Wno-zero-as-null-pointer-constant") SET(CMAKE_SHARED_LINKER_FLAGS "") # Build debug info for all configurations @@ -37,12 +37,6 @@ SET(PHYSX_IOS_RELEASE_COMPILE_DEFS NDEBUG;PX_SUPPORT_PVD=0) SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/ios "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") - # Include all of the projects INCLUDE(NvCloth.cmake) diff --git a/NvCloth/compiler/cmake/ios/NvCloth.cmake b/NvCloth/compiler/cmake/ios/NvCloth.cmake index e837e4a..2da5516 100644 --- a/NvCloth/compiler/cmake/ios/NvCloth.cmake +++ b/NvCloth/compiler/cmake/ios/NvCloth.cmake @@ -42,11 +42,6 @@ SET(NVCLOTH_LIBTYPE STATIC) INCLUDE(../common/NvCloth.cmake) -# Add linked libraries -# TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${NVTOOLSEXT_LIBRARIES} LowLevel LowLevelAABB LowLevelCloth LowLevelDynamics LowLevelParticles PhysXCommon PhysXGpu PxFoundation PxPvdSDK PxTask SceneQuery SimulationController) - -TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation) - SET_TARGET_PROPERTIES(NvCloth PROPERTIES LINK_FLAGS_DEBUG "" LINK_FLAGS_CHECKED "" diff --git a/NvCloth/compiler/cmake/linux/CMakeLists.txt b/NvCloth/compiler/cmake/linux/CMakeLists.txt index 5bd8323..f8ba400 100644 --- a/NvCloth/compiler/cmake/linux/CMakeLists.txt +++ b/NvCloth/compiler/cmake/linux/CMakeLists.txt @@ -43,12 +43,6 @@ SET(PHYSX_LINUX_RELEASE_COMPILE_DEFS NDEBUG;PX_SUPPORT_PVD=0) SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/linux "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") - # Include all of the projects INCLUDE(NvCloth.cmake) diff --git a/NvCloth/compiler/cmake/linux/NvCloth.cmake b/NvCloth/compiler/cmake/linux/NvCloth.cmake index 1d53df6..64188f0 100644 --- a/NvCloth/compiler/cmake/linux/NvCloth.cmake +++ b/NvCloth/compiler/cmake/linux/NvCloth.cmake @@ -30,6 +30,8 @@ SET(NVCLOTH_PLATFORM_INCLUDES ) SET(NVCLOTH_PLATFORM_SOURCE_FILES + ${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixAtomic.cpp + ${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixFPU.h #${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp #${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp #${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp @@ -128,11 +130,6 @@ ENDIF() # include common NvCloth settings INCLUDE(../common/NvCloth.cmake) - -# Add linked libraries -# TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${NVTOOLSEXT_LIBRARIES} LowLevel LowLevelAABB LowLevelCloth LowLevelDynamics LowLevelParticles PhysXCommon PhysXGpu PxFoundation PxPvdSDK PxTask SceneQuery SimulationController) - -TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation) TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${CUDA_CUDA_LIBRARY}) SET_TARGET_PROPERTIES(NvCloth PROPERTIES @@ -144,4 +141,4 @@ SET_TARGET_PROPERTIES(NvCloth PROPERTIES # enable -fPIC so we can link static libs with the editor SET_TARGET_PROPERTIES(NvCloth PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -MESSAGE("[NvCloth]cmake/linux/NvCloth.cmake END") \ No newline at end of file +MESSAGE("[NvCloth]cmake/linux/NvCloth.cmake END") diff --git a/NvCloth/compiler/cmake/mac/CMakeLists.txt b/NvCloth/compiler/cmake/mac/CMakeLists.txt index 83ca14d..903e545 100644 --- a/NvCloth/compiler/cmake/mac/CMakeLists.txt +++ b/NvCloth/compiler/cmake/mac/CMakeLists.txt @@ -45,12 +45,6 @@ SET(PHYSX_MAC_RELEASE_COMPILE_DEFS NDEBUG;PX_SUPPORT_PVD=0) SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/mac "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") - # Include all of the projects INCLUDE(NvCloth.cmake) diff --git a/NvCloth/compiler/cmake/mac/NvCloth.cmake b/NvCloth/compiler/cmake/mac/NvCloth.cmake index faea6fd..086b508 100644 --- a/NvCloth/compiler/cmake/mac/NvCloth.cmake +++ b/NvCloth/compiler/cmake/mac/NvCloth.cmake @@ -15,6 +15,8 @@ SET(NVCLOTH_PLATFORM_INCLUDES ) SET(NVCLOTH_PLATFORM_SOURCE_FILES + ${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixAtomic.cpp + ${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixFPU.h #${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp #${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp #${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp @@ -42,11 +44,6 @@ SET(NVCLOTH_LIBTYPE SHARED) INCLUDE(../common/NvCloth.cmake) -# Add linked libraries -# TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${NVTOOLSEXT_LIBRARIES} LowLevel LowLevelAABB LowLevelCloth LowLevelDynamics LowLevelParticles PhysXCommon PhysXGpu PxFoundation PxPvdSDK PxTask SceneQuery SimulationController) - -TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation) - SET_TARGET_PROPERTIES(NvCloth PROPERTIES LINK_FLAGS_DEBUG "" LINK_FLAGS_CHECKED "" diff --git a/NvCloth/compiler/cmake/windows/CMakeLists.txt b/NvCloth/compiler/cmake/windows/CMakeLists.txt index 9e8f66b..30f2a65 100644 --- a/NvCloth/compiler/cmake/windows/CMakeLists.txt +++ b/NvCloth/compiler/cmake/windows/CMakeLists.txt @@ -69,12 +69,6 @@ SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}") SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/windows "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") - # Include all of the projects INCLUDE(NvCloth.cmake) IF(DEFINED PX_GENERATE_GPU_PROJECTS) diff --git a/NvCloth/compiler/cmake/windows/NvCloth.cmake b/NvCloth/compiler/cmake/windows/NvCloth.cmake index cc8ca0f..065ea18 100644 --- a/NvCloth/compiler/cmake/windows/NvCloth.cmake +++ b/NvCloth/compiler/cmake/windows/NvCloth.cmake @@ -23,7 +23,11 @@ ENDIF() SET(NVCLOTH_PLATFORM_INCLUDES PRIVATE ${CUDA_INCLUDE_DIRS}) -SET(NVCLOTH_PLATFORM_SOURCE_FILES "" ) +SET(NVCLOTH_PLATFORM_SOURCE_FILES + ${PROJECT_ROOT_DIR}/src/ps/windows/PsWindowsAtomic.cpp + ${PROJECT_ROOT_DIR}/src/ps/windows/PsWindowsFPU.h + ${PROJECT_ROOT_DIR}/src/ps/windows/PsWindowsInclude.h +) IF(${NV_CLOTH_ENABLE_CUDA}) LIST(APPEND NVCLOTH_PLATFORM_SOURCE_FILES ${PROJECT_ROOT_DIR}/src/cuda/CuCheckSuccess.h @@ -48,6 +52,7 @@ LIST(APPEND NVCLOTH_PLATFORM_SOURCE_FILES ${PROJECT_ROOT_DIR}/src/cuda/CuSolver.h ${PROJECT_ROOT_DIR}/src/cuda/CuSolverKernel.h ${PROJECT_ROOT_DIR}/src/cuda/CuSolverKernelBlob.h + ${PROJECT_ROOT_DIR}/include/NvCloth/ps/windows/PsWindowsIntrinsics.h ) ENDIF() @@ -164,13 +169,12 @@ INCLUDE(../common/NvCloth.cmake) # Add linked libraries -TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation) TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${CUDA_CUDA_LIBRARY}) SET_TARGET_PROPERTIES(NvCloth PROPERTIES - LINK_FLAGS_DEBUG "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundationDEBUG_${LIBPATH_SUFFIX}.dll /DEBUG" - LINK_FLAGS_CHECKED "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundationCHECKED_${LIBPATH_SUFFIX}.dll" - LINK_FLAGS_PROFILE "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundationPROFILE_${LIBPATH_SUFFIX}.dll /INCREMENTAL:NO /DEBUG" - LINK_FLAGS_RELEASE "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundation_${LIBPATH_SUFFIX}.dll /INCREMENTAL:NO" + LINK_FLAGS_DEBUG "/DELAYLOAD:nvcuda.dll /MAP /DEBUG" + LINK_FLAGS_CHECKED "/DELAYLOAD:nvcuda.dll /MAP " + LINK_FLAGS_PROFILE "/DELAYLOAD:nvcuda.dll /MAP /INCREMENTAL:NO /DEBUG" + LINK_FLAGS_RELEASE "/DELAYLOAD:nvcuda.dll /MAP /INCREMENTAL:NO" ) MESSAGE("[NvCloth]cmake/windows/NvCloth.cmake END") \ No newline at end of file diff --git a/NvCloth/docs/documentation/CollisionDetection/Index.html b/NvCloth/docs/documentation/CollisionDetection/Index.html index b6b9501..ff23dc0 100644 --- a/NvCloth/docs/documentation/CollisionDetection/Index.html +++ b/NvCloth/docs/documentation/CollisionDetection/Index.html @@ -7,7 +7,7 @@ - Internal collision detection documentation — NvCloth 1.1.3 documentation + Internal collision detection documentation — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -252,7 +252,7 @@
@@ -261,7 +261,7 @@
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/CollisionDetection/InterCollision.html b/NvCloth/docs/documentation/CollisionDetection/InterCollision.html index fb561dd..9928cbe 100644 --- a/NvCloth/docs/documentation/CollisionDetection/InterCollision.html +++ b/NvCloth/docs/documentation/CollisionDetection/InterCollision.html @@ -7,7 +7,7 @@ - Inter Collision — NvCloth 1.1.3 documentation + Inter Collision — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -58,7 +58,7 @@
@@ -281,7 +281,7 @@ Now the narrow phase only has to deal with the particles in those lists.

@@ -291,7 +291,7 @@ Now the narrow phase only has to deal with the particles in those lists.

- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/CollisionDetection/SelfCollision.html b/NvCloth/docs/documentation/CollisionDetection/SelfCollision.html index 9427251..37416c6 100644 --- a/NvCloth/docs/documentation/CollisionDetection/SelfCollision.html +++ b/NvCloth/docs/documentation/CollisionDetection/SelfCollision.html @@ -7,7 +7,7 @@ - Self Collision — NvCloth 1.1.3 documentation + Self Collision — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -58,7 +58,7 @@
@@ -309,7 +309,7 @@ p1 -= delta * w1
@@ -319,7 +319,7 @@ p1 -= delta * w1
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/CollisionDetection/SphereCapsuleCollision.html b/NvCloth/docs/documentation/CollisionDetection/SphereCapsuleCollision.html index 8caa955..78d5841 100644 --- a/NvCloth/docs/documentation/CollisionDetection/SphereCapsuleCollision.html +++ b/NvCloth/docs/documentation/CollisionDetection/SphereCapsuleCollision.html @@ -7,7 +7,7 @@ - Sphere Capsule collision detection — NvCloth 1.1.3 documentation + Sphere Capsule collision detection — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -58,7 +58,7 @@
@@ -555,7 +555,7 @@ The friction impulse magnitude is proportional to the friction coefficient and t
@@ -565,7 +565,7 @@ The friction impulse magnitude is proportional to the friction coefficient and t
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/Compiling/index.html b/NvCloth/docs/documentation/Compiling/index.html index 1900835..ecef8e7 100644 --- a/NvCloth/docs/documentation/Compiling/index.html +++ b/NvCloth/docs/documentation/Compiling/index.html @@ -7,7 +7,7 @@ - Compiling — NvCloth 1.1.3 documentation + Compiling — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -320,7 +320,7 @@ Specifically, you need to create a symlink/copy/rename:

@@ -329,7 +329,7 @@ Specifically, you need to create a symlink/copy/rename:

- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/Cooking/Index.html b/NvCloth/docs/documentation/Cooking/Index.html index 03e56ca..40f9596 100644 --- a/NvCloth/docs/documentation/Cooking/Index.html +++ b/NvCloth/docs/documentation/Cooking/Index.html @@ -7,7 +7,7 @@ - Internal cooking documentation — NvCloth 1.1.3 documentation + Internal cooking documentation — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -242,7 +242,7 @@
@@ -251,7 +251,7 @@
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/Cooking/TripletScheduler.html b/NvCloth/docs/documentation/Cooking/TripletScheduler.html index fef2bfb..0954f40 100644 --- a/NvCloth/docs/documentation/Cooking/TripletScheduler.html +++ b/NvCloth/docs/documentation/Cooking/TripletScheduler.html @@ -7,7 +7,7 @@ - TripletScheduler — NvCloth 1.1.3 documentation + TripletScheduler — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -267,7 +267,7 @@ It also optimizes the sets to have the least amount of bank conflicts possible.<
@@ -277,7 +277,7 @@ It also optimizes the sets to have the least amount of bank conflicts possible.<
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/CopyRight/Index.html b/NvCloth/docs/documentation/CopyRight/Index.html index becc894..9122110 100644 --- a/NvCloth/docs/documentation/CopyRight/Index.html +++ b/NvCloth/docs/documentation/CopyRight/Index.html @@ -7,7 +7,7 @@ - NVIDIA Copyright Notice — NvCloth 1.1.3 documentation + NVIDIA Copyright Notice — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -240,7 +240,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.

@@ -249,7 +249,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.

- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/Modules/Index.html b/NvCloth/docs/documentation/Modules/Index.html index bc2271c..b6c6a23 100644 --- a/NvCloth/docs/documentation/Modules/Index.html +++ b/NvCloth/docs/documentation/Modules/Index.html @@ -7,7 +7,7 @@ - Modules — NvCloth 1.1.3 documentation + Modules — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -242,7 +242,7 @@ Users that want to use their own cooking or offline cooking can bypass these fun
@@ -251,7 +251,7 @@ Users that want to use their own cooking or offline cooking can bypass these fun
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/ReleaseNotes/index.html b/NvCloth/docs/documentation/ReleaseNotes/index.html index fb5bfc5..ba5ac7b 100644 --- a/NvCloth/docs/documentation/ReleaseNotes/index.html +++ b/NvCloth/docs/documentation/ReleaseNotes/index.html @@ -7,7 +7,7 @@ - Release Notes — NvCloth 1.1.3 documentation + Release Notes — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -369,7 +369,7 @@
@@ -378,7 +378,7 @@
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/Solver/Index.html b/NvCloth/docs/documentation/Solver/Index.html index db5e227..8277796 100644 --- a/NvCloth/docs/documentation/Solver/Index.html +++ b/NvCloth/docs/documentation/Solver/Index.html @@ -7,7 +7,7 @@ - Internal solver function/algorithm documentation — NvCloth 1.1.3 documentation + Internal solver function/algorithm documentation — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -507,7 +507,7 @@ The first rest value of set s is mRestvalues[mSets[s]] and the last is mRestvalu
@@ -516,7 +516,7 @@ The first rest value of set s is mRestvalues[mSets[s]] and the last is mRestvalu
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/UserGuide/Index.html b/NvCloth/docs/documentation/UserGuide/Index.html index 3a465d6..5f6dd0d 100644 --- a/NvCloth/docs/documentation/UserGuide/Index.html +++ b/NvCloth/docs/documentation/UserGuide/Index.html @@ -7,7 +7,7 @@ - User Guide — NvCloth 1.1.3 documentation + User Guide — NvCloth 1.1.5 documentation @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@
@@ -687,7 +687,7 @@ This helps for both decreasing collision shape penetration and improving cloth s
@@ -696,7 +696,7 @@ This helps for both decreasing collision shape penetration and improving cloth s
- Copyright © 2014, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy + Copyright © 2019, NVIDIA Corporation   |   About NVIDIA   |   Legal Information   |   Privacy Policy
diff --git a/NvCloth/docs/documentation/genindex.html b/NvCloth/docs/documentation/genindex.html index b2db867..2fd9659 100644 --- a/NvCloth/docs/documentation/genindex.html +++ b/NvCloth/docs/documentation/genindex.html @@ -8,7 +8,7 @@ - Index — NvCloth 1.1.3 documentation + Index — NvCloth 1.1.5 documentation @@ -19,7 +19,7 @@ - +