AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🎉 Added OGRE 13.0.0

Browse Source
This commit is contained in:
Edgar
2021-08-14 17:18:14 +00:00
committed by GitHub
parent 33f4edfd5e
commit 92a0e0704a
8 changed files with 351 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ogre/13/patches/13.0.0/AddLibPNG.patch Normal file
View File

@ -0,0 +1,33 @@
--- Components/Overlay/CMakeLists.txt
+++ Components/Overlay/CMakeLists.txt
@@ -7,6 +7,21 @@
# free to make use of it in any way you like.
#-------------------------------------------------------------------
+
+# FreeType from conan has seperate libraries
+find_package(PNG)
+find_package(BZip2)
+
+find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static)
+find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static)
+
+if(NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLICOMMON_LIBRARY-NOTFOUND" AND NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLIDEC_LIBRARY-NOTFOUND")
+ set(BROTLI_LIBRARIES ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY})
+ message(STATUS "Brotli libraries found: ${BROTLI_LIBRARIES}")
+else()
+ message(WARNING "Brotli library not found: ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}")
+endif()
+
############################################################
# Overlay optional component
############################################################
@@ -52,7 +67,7 @@
if(FREETYPE_FOUND)
target_compile_definitions(OgreOverlay PRIVATE HAVE_FREETYPE)
- target_link_libraries(OgreOverlay PRIVATE ${FREETYPE_LIBRARIES})
+ target_link_libraries(OgreOverlay PRIVATE ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB)
target_include_directories(OgreOverlay PRIVATE ${FREETYPE_INCLUDE_DIRS})
elseif(UNIX)
set_source_files_properties(src/OgreFont.cpp PROPERTIES

19
ogre/13/patches/13.0.0/CMakeLists.txt.patch Normal file
View File

@ -0,0 +1,19 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -20,6 +20,8 @@
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
+include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
+
if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android")
set(CMAKE_LINK_LIBRARY_FLAG "")
endif()
@@ -74,6 +76,7 @@
"${PROJECT_SOURCE_DIR}/CMake"
"${PROJECT_SOURCE_DIR}/CMake/Utils"
"${PROJECT_SOURCE_DIR}/CMake/Packages"
+ "${CMAKE_BINARY_DIR}"
)
include(CMakeDependentOption)

20
ogre/13/patches/13.0.0/Dependencies.cmake.patch Normal file
View File

@ -0,0 +1,20 @@
--- CMake/Dependencies.cmake
+++ CMake/Dependencies.cmake
@@ -13,7 +13,7 @@
# OGRE_DEPENDENCIES_DIR can be used to specify a single base
# folder where the required dependencies may be found.
-set(OGRE_DEPENDENCIES_DIR "${PROJECT_BINARY_DIR}/Dependencies" CACHE PATH "Path to prebuilt OGRE dependencies")
+set(OGRE_DEPENDENCIES_DIR ${CMAKE_PREFIX_PATH})
option(OGRE_BUILD_DEPENDENCIES "automatically build Ogre Dependencies (SDL2, pugixml)" TRUE)
message(STATUS "DEPENDENCIES_DIR: ${OGRE_DEPENDENCIES_DIR}")
@@ -68,7 +68,7 @@
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${OGRE_DEP_SEARCH_PATH})
set(CMAKE_FRAMEWORK_PATH ${CMAKE_FRAMEWORK_PATH} ${OGRE_DEP_SEARCH_PATH})
-if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH})
+if(0)
message(STATUS "Building pugixml")
file(DOWNLOAD
https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz

15
ogre/13/patches/13.0.0/pugixml-fix.patch Normal file
View File

@ -0,0 +1,15 @@
--- Tools/XMLConverter/CMakeLists.txt
+++ Tools/XMLConverter/CMakeLists.txt
@@ -21,9 +21,10 @@
src/OgreXMLSkeletonSerializer.cpp
)
+message("Fixing OgreXMLConverter")
add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES})
-target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_link_libraries(OgreXMLConverter OgreMain pugixml)
+target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${pugixml_INCLUDE_DIRS})
+target_link_libraries(OgreXMLConverter OgreMain pugixml::pugixml)
if (OGRE_PROJECT_FOLDERS)
set_property(TARGET OgreXMLConverter PROPERTY FOLDER Tools)