diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml index 3c2a3423..a27bf46c 100644 --- a/.github/workflows/apple.yml +++ b/.github/workflows/apple.yml @@ -246,7 +246,6 @@ jobs: rm -rf $HOME/dependencies-${{ steps.sysroot.outputs.lowercase }}-${{ matrix.arch }}/lib/pkgconfig - name: Build libjpeg-turbo run: | - # yasm doesn't support -fembed-bitcode # As jpeg is not performance crticial enough for STK so it's built with asm disabled for non-MacOSX if [ ${{ matrix.platform }} = "MacOSX" ]; then sudo apt install -y yasm @@ -401,8 +400,8 @@ jobs: cd src/moltenvk ./fetchDependencies --macos --iossim --tvossim xcodebuild build -quiet -project MoltenVKPackaging.xcodeproj -scheme "MoltenVK Package (macOS only)" -configuration "Release" - xcodebuild build -quiet -project MoltenVKPackaging.xcodeproj -scheme "MoltenVK Package (iOS only)" -destination "generic/platform=iOS Simulator" -configuration "Release" OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" - xcodebuild build -quiet -project "MoltenVKPackaging.xcodeproj" -scheme "MoltenVK Package (tvOS only)" -destination "generic/platform=tvOS Simulator" -configuration "Release" OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" + xcodebuild build -quiet -project MoltenVKPackaging.xcodeproj -scheme "MoltenVK Package (iOS only)" -destination "generic/platform=iOS Simulator" -configuration "Release" + xcodebuild build -quiet -project "MoltenVKPackaging.xcodeproj" -scheme "MoltenVK Package (tvOS only)" -destination "generic/platform=tvOS Simulator" -configuration "Release" touch -r README.md Package/Release/MoltenVK/include/MoltenVK/* touch -r README.md Package/Release/MoltenVK/include/vk_video/* touch -r README.md Package/Release/MoltenVK/include/vulkan/* diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index d4d57e03..2d19f5d8 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -258,7 +258,7 @@ jobs: run: | cd src/moltenvk ./fetchDependencies --ios - xcodebuild build -quiet -project MoltenVKPackaging.xcodeproj -scheme "MoltenVK Package (iOS only)" -configuration "Release" OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" + xcodebuild build -quiet -project MoltenVKPackaging.xcodeproj -scheme "MoltenVK Package (iOS only)" -configuration "Release" touch -r README.md Package/Release/MoltenVK/include/MoltenVK/* touch -r README.md Package/Release/MoltenVK/include/vk_video/* touch -r README.md Package/Release/MoltenVK/include/vulkan/* @@ -269,7 +269,7 @@ jobs: run: | cd src/moltenvk ./fetchDependencies --tvos - xcodebuild build -quiet -project "MoltenVKPackaging.xcodeproj" -scheme "MoltenVK Package (tvOS only)" -configuration "Release" OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE="bitcode" + xcodebuild build -quiet -project "MoltenVKPackaging.xcodeproj" -scheme "MoltenVK Package (tvOS only)" -configuration "Release" touch -r README.md Package/Release/MoltenVK/include/MoltenVK/* touch -r README.md Package/Release/MoltenVK/include/vk_video/* touch -r README.md Package/Release/MoltenVK/include/vulkan/* diff --git a/cmake/Toolchain-cctools.cmake b/cmake/Toolchain-cctools.cmake index 296132fa..c7a612c2 100644 --- a/cmake/Toolchain-cctools.cmake +++ b/cmake/Toolchain-cctools.cmake @@ -13,11 +13,6 @@ else() set(CLANG_ARCH ${CCTOOLS_ARCH}) endif() -if (NOT CCTOOLS_PLATFORM MATCHES MacOSX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode") -endif() - SET(CMAKE_C_COMPILER ${CCTOOLS_PREFIX}/bin/${CCTOOLS_ARCH}-${platform_lower}-clang) SET(CMAKE_CXX_COMPILER ${CCTOOLS_PREFIX}/bin/${CCTOOLS_ARCH}-${platform_lower}-clang++) SET(CMAKE_RANLIB ${CCTOOLS_PREFIX}/bin/${CLANG_ARCH}-apple-darwin11-ranlib) diff --git a/cmake/Toolchain-ios.cmake b/cmake/Toolchain-ios.cmake index d7721630..9fd8a514 100644 --- a/cmake/Toolchain-ios.cmake +++ b/cmake/Toolchain-ios.cmake @@ -51,10 +51,6 @@ 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}") -# For archive -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode") - if(IOS_SYSROOT MATCHES iphoneos) set(IOS TRUE CACHE BOOL "") set(CMAKE_SYSTEM_NAME iOS CACHE INTERNAL "" FORCE)