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

Allow MoltenVK to be installed and built without asciidoctor.

Browse Source
This commit is contained in:
Bill Hollings 2018-03-01 21:39:39 -05:00
parent 26967d4fa1
commit 754cc10730
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
External/makeSPIRVTools vendored
View File

@ -7,6 +7,11 @@
# macOS usage: ./makeSPIRVTools # macOS usage: ./makeSPIRVTools
# Build SPIRV-Tools # Build SPIRV-Tools
echo
echo MoltenVK building SPIRV-Tools
echo
ln -sfn ../../SPIRV-Headers SPIRV-Tools/external/SPIRV-Headers ln -sfn ../../SPIRV-Headers SPIRV-Tools/external/SPIRV-Headers
rm -rf SPIRV-Tools/build rm -rf SPIRV-Tools/build
mkdir SPIRV-Tools/build mkdir SPIRV-Tools/build

10
External/makeVulkanSpec vendored
View File

@ -12,6 +12,11 @@
MVK_EXTS="VK_KHR_swapchain VK_KHR_surface VK_MVK_ios_surface VK_MVK_macos_surface VK_IMG_format_pvrtc VK_AMD_negative_viewport_height" MVK_EXTS="VK_KHR_swapchain VK_KHR_surface VK_MVK_ios_surface VK_MVK_macos_surface VK_IMG_format_pvrtc VK_AMD_negative_viewport_height"
# Generate vulkan.hpp and consolidate all header files # Generate vulkan.hpp and consolidate all header files
echo
echo MoltenVK building vulkan.h
echo
cd Vulkan-Hpp cd Vulkan-Hpp
cmake . cmake .
make make
@ -20,6 +25,11 @@ cp Vulkan-Docs/src/vulkan/*.h vulkan
cd - cd -
# Generate the Vulkan Spec document # Generate the Vulkan Spec document
echo
echo MoltenVK building Vulkan spec document
echo
cd Vulkan-Hpp/Vulkan-Docs/doc/specs/vulkan cd Vulkan-Hpp/Vulkan-Docs/doc/specs/vulkan
make clean_generated make clean_generated
make EXTENSIONS="$MVK_EXTS" APITITLE="(with extensions supported by MoltenVK)" html make EXTENSIONS="$MVK_EXTS" APITITLE="(with extensions supported by MoltenVK)" html

5
External/makeglslang vendored
View File

@ -7,6 +7,11 @@
# macOS usage: ./makeglslang # macOS usage: ./makeglslang
# Build glslang # Build glslang
echo
echo MoltenVK building glslang
echo
rm -rf glslang/build rm -rf glslang/build
mkdir glslang/build mkdir glslang/build
cd glslang/build cd glslang/build

2
MoltenVKPackaging.xcodeproj/project.pbxproj
View File

@ -316,7 +316,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "set -e\n\n# Package folder\nexport MVK_WKSPC_PATH=\"${PROJECT_DIR}\"\nexport MVK_PKG_LOCN=\"${MVK_WKSPC_PATH}/Package\"\nexport MVK_PKG_CONFIG_PATH=\"${MVK_PKG_LOCN}/${CONFIGURATION}\"\n\n# Copy the docs\ncp -a \"${MVK_WKSPC_PATH}/LICENSE\" \"${MVK_PKG_CONFIG_PATH}\"\ncp -pRLf \"${MVK_WKSPC_PATH}/Docs\" \"${MVK_PKG_CONFIG_PATH}\"\n\n"; shellScript = "set -e\n\n# Package folder\nexport MVK_WKSPC_PATH=\"${PROJECT_DIR}\"\nexport MVK_PKG_LOCN=\"${MVK_WKSPC_PATH}/Package\"\nexport MVK_PKG_CONFIG_PATH=\"${MVK_PKG_LOCN}/${CONFIGURATION}\"\n\n# Copy the docs. Allow silent fail if a symlinked doc is not built.\ncp -a \"${MVK_WKSPC_PATH}/LICENSE\" \"${MVK_PKG_CONFIG_PATH}\"\ncp -pRLf \"${MVK_WKSPC_PATH}/Docs\" \"${MVK_PKG_CONFIG_PATH}\" 2> /dev/null || true\n\n";
}; };
A9FEADD61F3517480010240E /* Package MoltenVK */ = { A9FEADD61F3517480010240E /* Package MoltenVK */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;

13
README.md
View File

@ -68,16 +68,21 @@ Installing **MoltenVK**
this `MoltenVK` repository, and then run the `External/makeAll` script to create necessary this `MoltenVK` repository, and then run the `External/makeAll` script to create necessary
components within the third-party libraries. components within the third-party libraries.
1. Ensure you have `python3` and `asciidoctor` installed: 1. Ensure you have `python3` installed:
brew install python3 brew install python3
sudo gem install asciidoctor
2. Recursively clone the `MoltenVK` repository: 2. **_Optional:_** If you want to generate a Vulkan specification document for inclusion
in the final **MoltenVK** distribution package, ensure you have `asciidoctor` installed
(you can skip this otherwise):
brew install asciidoctor
3. Recursively clone the `MoltenVK` repository:
git clone --recursive https://github.com/KhronosGroup/MoltenVK.git git clone --recursive https://github.com/KhronosGroup/MoltenVK.git
3. Run the third-party build script: 4. Run the third-party build script:
cd MoltenVK/External cd MoltenVK/External
./makeAll ./makeAll