diff --git a/build-ogre.sh b/build-ogre.sh index 459b0fe..f4fcb5a 100755 --- a/build-ogre.sh +++ b/build-ogre.sh @@ -96,10 +96,10 @@ build_cmake_stuff() { cd $MDIR } -rm -Rf assimp/build assimp/build-static -rm -Rf ogre/build ogre/build-static ogre-sdk ogre-sdk-static -rm -Rf ogre-procedural/build ogre-procedural/build-static -rm -Rf ogre-projects/world2/build ogre-projects/world2/build-static +#rm -Rf assimp/build assimp/build-static +#rm -Rf ogre/build ogre/build-static ogre-sdk ogre-sdk-static +#rm -Rf ogre-procedural/build ogre-procedural/build-static +#rm -Rf ogre-projects/world2/build ogre-projects/world2/build-static #(cd bzip2-1.0.8 && make all && make install PREFIX=${OGRE_INSTALL_PATH}) #(cd bzip2-1.0.8 && make all && make install PREFIX=${OGRE_INSTALL_PATH}-static) build_cmake_stuff clean debug release SDL "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -124,6 +124,9 @@ build_cmake_stuff debug release assimp "-DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LI build_cmake_stuff debug release static assimp "-DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF" build_cmake_stuff release SPIRV-Headers "" build_cmake_stuff release SPIRV-Tools "-DBUILD_SHARED_LIBS=OFF -DSPIRV_TOOLS_BUILD_STATIC=ON -DSPIRV_TOOLS_LIBRARY_TYPE=STATIC" +cd glslang +python3 update_glslang_sources.py +cd .. build_cmake_stuff release noinstall glslang "-DBUILD_SHARED_LIBS=OFF -DENABLE_HLSL=TRUE -DENABLE_SPIRV=TRUE" build_cmake_stuff release noinstall static glslang "-DBUILD_SHARED_LIBS=OFF -DENABLE_HLSL=TRUE -DENABLE_SPIRV=TRUE" install -m 755 -d ogre-sdk/bin diff --git a/ogre-projects/world2 b/ogre-projects/world2 index cb42299..51c25ac 160000 --- a/ogre-projects/world2 +++ b/ogre-projects/world2 @@ -1 +1 @@ -Subproject commit cb4229905d18dc625a8e2cc9193567eb60e59056 +Subproject commit 51c25ac6a6629b8abc033a261401949123654e25