Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Updated OGRE to 13.5 #56

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

⬆️ Updated OGRE to 13.5 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad4f562
:arrow_up: Updated OGRE to 13.5
AnotherFoxGuy Nov 2, 2022
3be59e6
:arrow_up: Updated caelum, mygui and pagedgeometry
AnotherFoxGuy Nov 3, 2022
4d52656
:arrow_up: Updated OGRE to 13.6.0
AnotherFoxGuy Jan 15, 2023
be21bb8
:arrow_up: Updated OGRE to 13.6.4
AnotherFoxGuy May 23, 2023
19098d7
:arrow_up: Updated MyGUI to 3.4.2
AnotherFoxGuy May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endif ()
# the ExternalProject module of CMake to build the individual dependencies.
# ------------------------------------------------------------------------------------------------#

project(ror-dependencies VERSION 30)
project(ror-dependencies VERSION 31)


# ------------------------------------------------------------------------------------------------#
Expand Down
4 changes: 2 additions & 2 deletions caelum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ endif ()
ExternalProject_Add(
caelum
DEPENDS ogre
URL https://github.com/RigsOfRods/ogre-caelum/archive/70fcf62f306288c9472cc03a42367c9625c839ea.tar.gz
URL_MD5 6fa41168cb93d67e7169d0e8e2d73f24
URL https://github.com/OGRECave/ogre-caelum/archive/4bd1b0581d55896d37922483981582661ca557de.tar.gz
URL_MD5 e6378f99faf131624b364829de9d0b8a
CMAKE_ARGS
-DCaelum_BUILD_SAMPLES=FALSE
-DINSTALL_OGRE_PLUGIN=OFF
Expand Down
4 changes: 2 additions & 2 deletions mygui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ExternalProject_Add(
mygui
DEPENDS ogre
URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.0.tar.gz
URL_MD5 30e64cdb3dc09a209259a5ffd13dc2ab
URL https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.2.tar.gz
URL_HASH SHA256=1cc45fb96c9438e3476778449af0378443d84794a458978a29c75306e45dd45a
CMAKE_ARGS
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
-DCMAKE_PREFIX_PATH=${DEPENDENCIES_OUTPUT_DIR}
Expand Down
10 changes: 5 additions & 5 deletions ogre/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ endif ()
# First build the required dependencies for Ogre itself. They are provided in a dedicated repository.
ExternalProject_Add(
ogredeps
URL https://github.com/AnotherFoxGuy/ogredeps/archive/17f4c583c82559074a96f1436670a4f10961b9d9.tar.gz
URL_MD5 d5425da9f4ffa9f24dd021e32a8665ad
URL https://github.com/AnotherFoxGuy/ogredeps/archive/9bb6925e815273ce6bee031e06e4df2a588f8cf3.tar.gz
URL_MD5 0f79899efa51ad1dd45f379525f3f6ad
CMAKE_ARGS
-DOGREDEPS_BUILD_AMD_QBS=OFF
-DOGREDEPS_BUILD_NVIDIA_NVAPI=OFF
Expand All @@ -41,9 +41,9 @@ endif ()
ExternalProject_Add(
ogre
DEPENDS ogredeps
URL https://github.com/OGRECave/ogre/archive/refs/tags/v1.11.6.tar.gz
URL_MD5 36ca3915aa41a0351bdf08b3953e9ae2
PATCH_COMMAND ${PATCH_TOOL_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/scriptlexer.patch
URL https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.4.tar.gz
URL_HASH SHA256=9a8bde4884b2ce66594d2192c5147a07ad0e7b0fc87de86c798597142867d272
#PATCH_COMMAND ${PATCH_TOOL_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/scriptlexer.patch
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_OUTPUT_DIR}
-DOGRE_DEPENDENCIES_DIR=${DEPENDENCIES_OUTPUT_DIR}
Expand Down
4 changes: 2 additions & 2 deletions pagedgeometry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ endif ()
ExternalProject_Add(
pagedgeometry
DEPENDS ogre
URL https://github.com/RigsOfRods/ogre-pagedgeometry/archive/9b4ee07dd7a884c667fc4051523b26b746bbd2c7.tar.gz
URL_MD5 5514a85cccd4132594d17582f9273047
URL https://github.com/OGRECave/ogre-pagedgeometry/archive/8637c7f4b6238ced28e741bb6e4d4ddc8b60b477.tar.gz
URL_MD5 32b282190b78a6146f2f1388ccb56b08
CMAKE_ARGS
-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF
-DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/OgreDependencies/;${DEPENDENCIES_OUTPUT_DIR}
Expand Down