Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-add support for bitcode generation on iOS and tvOS.

Browse Source 
Set BITCODE_GENERATION_MODE build setting in all Xcode projects.
create_dylib.sh support BITCODE_GENERATION_MODE.
This commit is contained in:
Bill Hollings 2020-08-11 20:18:50 -04:00
parent 72ef14ed27
commit d4b5df532e
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Docs/Whats_New.md
View File

@ -23,6 +23,7 @@ Released TBD
- `vkCmdBindDescriptorSets` order `pDynamicOffsets` by descriptor binding number - `vkCmdBindDescriptorSets` order `pDynamicOffsets` by descriptor binding number
within each descriptor set. within each descriptor set.
- `vkCmdCopyImage` on macOS flush non-coherent image memory before copy operation. - `vkCmdCopyImage` on macOS flush non-coherent image memory before copy operation.
- Re-add support for bitcode generation on *iOS* and *tvOS*.

2
ExternalDependencies.xcodeproj/project.pbxproj
View File

@ -5287,6 +5287,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
BITCODE_GENERATION_MODE = marker;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;
@ -5335,6 +5336,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
BITCODE_GENERATION_MODE = bitcode;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;

2
MoltenVK/MoltenVK.xcodeproj/project.pbxproj
View File

@ -1644,6 +1644,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
BITCODE_GENERATION_MODE = marker;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;
@ -1706,6 +1707,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
BITCODE_GENERATION_MODE = bitcode;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
View File

@ -1163,6 +1163,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
BITCODE_GENERATION_MODE = marker;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;
@ -1218,6 +1219,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
BITCODE_GENERATION_MODE = bitcode;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;

9
Scripts/create_dylib.sh
View File

@ -9,8 +9,13 @@ export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib"
mkdir -p "${MVK_BUILT_PROD_DIR}/dynamic" mkdir -p "${MVK_BUILT_PROD_DIR}/dynamic"
if test x"${ENABLE_BITCODE}" = xYES; then export MVK_EMBED_BITCODE=""
MVK_EMBED_BITCODE="-fembed-bitcode" if test x"${ENABLE_BITCODE}" == xYES; then
if test x"${BITCODE_GENERATION_MODE}" == xbitcode; then
MVK_EMBED_BITCODE="-fembed-bitcode"
else
MVK_EMBED_BITCODE="-fembed-bitcode-marker"
fi
fi fi
if test x"${ENABLE_THREAD_SANITIZER}" = xYES; then if test x"${ENABLE_THREAD_SANITIZER}" = xYES; then