diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7418401be..229c13941 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -240,19 +240,11 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-x86_64/install/lib/libglslang.a \ - build-x86_64/install/lib/libMachineIndependent.a \ - build-x86_64/install/lib/libGenericCodeGen.a \ build-x86_64/install/lib/libSPIRV.a \ - build-x86_64/install/lib/libOGLCompiler.a \ - build-x86_64/install/lib/libOSDependent.a \ -o build-x86_64/install/lib/libglslang_combined.a libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a lipo -create build-x86_64/install/lib/libglslang_combined.a build-arm64/install/lib/libglslang_combined.a -o glslang.framework/Versions/A/glslang cp -a build-x86_64/install/include/glslang glslang.framework/Versions/A/Headers/ @@ -414,11 +406,7 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a cp build-arm64/install/lib/libglslang_combined.a glslang.framework/Versions/A/glslang cp -a build-arm64/install/include/glslang glslang.framework/Versions/A/Headers/ @@ -597,19 +585,11 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-x86_64/install/lib/libglslang.a \ - build-x86_64/install/lib/libMachineIndependent.a \ - build-x86_64/install/lib/libGenericCodeGen.a \ build-x86_64/install/lib/libSPIRV.a \ - build-x86_64/install/lib/libOGLCompiler.a \ - build-x86_64/install/lib/libOSDependent.a \ -o build-x86_64/install/lib/libglslang_combined.a libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a lipo -create \ build-x86_64/install/lib/libglslang_combined.a \ @@ -794,19 +774,11 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-x86_64/install/lib/libglslang.a \ - build-x86_64/install/lib/libMachineIndependent.a \ - build-x86_64/install/lib/libGenericCodeGen.a \ build-x86_64/install/lib/libSPIRV.a \ - build-x86_64/install/lib/libOGLCompiler.a \ - build-x86_64/install/lib/libOSDependent.a \ -o build-x86_64/install/lib/libglslang_combined.a libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a lipo -create \ build-x86_64/install/lib/libglslang_combined.a \ @@ -1289,19 +1261,11 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a libtool -static \ build-arm64e/install/lib/libglslang.a \ - build-arm64e/install/lib/libMachineIndependent.a \ - build-arm64e/install/lib/libGenericCodeGen.a \ build-arm64e/install/lib/libSPIRV.a \ - build-arm64e/install/lib/libOGLCompiler.a \ - build-arm64e/install/lib/libOSDependent.a \ -o build-arm64e/install/lib/libglslang_combined.a lipo -create \ build-arm64/install/lib/libglslang_combined.a \ @@ -1486,19 +1450,11 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-x86_64/install/lib/libglslang.a \ - build-x86_64/install/lib/libMachineIndependent.a \ - build-x86_64/install/lib/libGenericCodeGen.a \ build-x86_64/install/lib/libSPIRV.a \ - build-x86_64/install/lib/libOGLCompiler.a \ - build-x86_64/install/lib/libOSDependent.a \ -o build-x86_64/install/lib/libglslang_combined.a libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a lipo -create \ build-x86_64/install/lib/libglslang_combined.a \ @@ -1666,11 +1622,7 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a cp build-arm64/install/lib/libglslang_combined.a glslang.framework/Versions/A/glslang cp -a build-arm64/install/include/glslang glslang.framework/Versions/A/Headers/ @@ -1849,19 +1801,11 @@ jobs: ln -s Versions/Current/glslang glslang.framework/glslang libtool -static \ build-x86_64/install/lib/libglslang.a \ - build-x86_64/install/lib/libMachineIndependent.a \ - build-x86_64/install/lib/libGenericCodeGen.a \ build-x86_64/install/lib/libSPIRV.a \ - build-x86_64/install/lib/libOGLCompiler.a \ - build-x86_64/install/lib/libOSDependent.a \ -o build-x86_64/install/lib/libglslang_combined.a libtool -static \ build-arm64/install/lib/libglslang.a \ - build-arm64/install/lib/libMachineIndependent.a \ - build-arm64/install/lib/libGenericCodeGen.a \ build-arm64/install/lib/libSPIRV.a \ - build-arm64/install/lib/libOGLCompiler.a \ - build-arm64/install/lib/libOSDependent.a \ -o build-arm64/install/lib/libglslang_combined.a lipo -create \ build-x86_64/install/lib/libglslang_combined.a \ diff --git a/docs/how-to-build/how-to-build.md b/docs/how-to-build/how-to-build.md index a491c40bc..6dd1d4cc9 100644 --- a/docs/how-to-build/how-to-build.md +++ b/docs/how-to-build/how-to-build.md @@ -565,7 +565,7 @@ ln -s A glslang.framework/Versions/Current ln -s Versions/Current/Headers glslang.framework/Headers ln -s Versions/Current/Resources glslang.framework/Resources ln -s Versions/Current/glslang glslang.framework/glslang -libtool -static build-ios/install/lib/libglslang.a build-ios/install/lib/libMachineIndependent.a build-ios/install/lib/libGenericCodeGen.a build-ios/install/lib/libSPIRV.a build-ios/install/lib/libOGLCompiler.a build-ios/install/lib/libOSDependent.a -o build-ios/install/lib/libglslang_combined.a +libtool -static build-ios/install/lib/libglslang.a build-ios/install/lib/libSPIRV.a -o build-ios/install/lib/libglslang_combined.a lipo -create build-ios/install/lib/libglslang_combined.a -o glslang.framework/Versions/A/glslang cp -r build/install/include/glslang glslang.framework/Versions/A/Headers/ sed -e 's/__NAME__/glslang/g' -e 's/__IDENTIFIER__/org.khronos.glslang/g' -e 's/__VERSION__/1.0/g' Info.plist > glslang.framework/Versions/A/Resources/Info.plist diff --git a/docs/how-to-use-and-FAQ/use-ncnn-with-own-project.md b/docs/how-to-use-and-FAQ/use-ncnn-with-own-project.md index 03b1b1ccd..9bfd7a444 100644 --- a/docs/how-to-use-and-FAQ/use-ncnn-with-own-project.md +++ b/docs/how-to-use-and-FAQ/use-ncnn-with-own-project.md @@ -28,11 +28,9 @@ For example, on Visual Studio debug mode with vulkan required, the lib paths are ``` E:\github\ncnn\build\vs2019-x64\install\lib\ncnnd.lib E:\github\ncnn\build\vs2019-x64\install\lib\glslangd.lib -E:\github\ncnn\build\vs2019-x64\install\lib\glslang-default-resource-limitsd.lib ``` And for its release mode, lib paths are: ``` E:\github\ncnn\build\vs2019-x64\install\lib\ncnn.lib E:\github\ncnn\build\vs2019-x64\install\lib\glslang.lib -E:\github\ncnn\build\vs2019-x64\install\lib\glslang-default-resource-limits.lib ```