🎉 Added ogre 1.12.13
This commit is contained in:
32
ogre/1.12/patches/1.12.13/AddLibPNG.patch
Normal file
32
ogre/1.12/patches/1.12.13/AddLibPNG.patch
Normal file
@ -0,0 +1,32 @@
|
||||
--- Components/Overlay/CMakeLists.txt
|
||||
+++ Components/Overlay/CMakeLists.txt
|
||||
@@ -11,6 +11,20 @@
|
||||
# Overlay optional component
|
||||
############################################################
|
||||
|
||||
+# 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()
|
||||
+
|
||||
# define header and source files for the library
|
||||
file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
|
||||
list(APPEND HEADER_FILES
|
||||
@@ -41,7 +55,7 @@
|
||||
# setup target
|
||||
add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
|
||||
set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION})
|
||||
-target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB)
|
||||
+target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE Freetype::Freetype ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB)
|
||||
target_include_directories(OgreOverlay PUBLIC
|
||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||
$<INSTALL_INTERFACE:include/OGRE/Overlay>
|
19
ogre/1.12/patches/1.12.13/CMakeLists.txt.patch
Normal file
19
ogre/1.12/patches/1.12.13/CMakeLists.txt.patch
Normal 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/1.12/patches/1.12.13/Dependencies.cmake.patch
Normal file
20
ogre/1.12/patches/1.12.13/Dependencies.cmake.patch
Normal 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
|
11
ogre/1.12/patches/1.12.13/FindPkgMacros.cmake.patch
Normal file
11
ogre/1.12/patches/1.12.13/FindPkgMacros.cmake.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- CMake/Utils/FindPkgMacros.cmake
|
||||
+++ CMake/Utils/FindPkgMacros.cmake
|
||||
@@ -82,7 +82,7 @@
|
||||
if (${PREFIX}_FWK)
|
||||
set(${PREFIX} ${${PREFIX}_FWK})
|
||||
elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
|
||||
- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
|
||||
+ set(${PREFIX} "$<$<CONFIG:Debug>:${${PREFIX}_DBG}>$<$<NOT:$<CONFIG:Debug>>:${${PREFIX}_REL}>")
|
||||
elseif (${PREFIX}_REL)
|
||||
set(${PREFIX} ${${PREFIX}_REL})
|
||||
elseif (${PREFIX}_DBG)
|
15
ogre/1.12/patches/1.12.13/pugixml-fix.patch
Normal file
15
ogre/1.12/patches/1.12.13/pugixml-fix.patch
Normal 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)
|
Reference in New Issue
Block a user