🎉 Added OGRE 13.2
This commit is contained in:
@ -1,21 +1,12 @@
|
||||
sources:
|
||||
"13.0.0":
|
||||
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.0.0.tar.gz"
|
||||
sha256: "404c91b0ab27edb45a643bc268143589c8f5160125d531cbf5d958fa55136063"
|
||||
"13.0.1":
|
||||
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.0.1.tar.gz"
|
||||
sha256: "8d31a79d37f74e5af25e56a0a70928079e771f7cea50ef041e04bf235c3f701a"
|
||||
"13.2.0":
|
||||
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.2.0.tar.gz"
|
||||
sha256: "1bcac0915116c6fa2435f30a016b0225d146785481c927b70d995ea459de5b6a"
|
||||
patches:
|
||||
"13.0.0":
|
||||
- patch_file: "patches/13.0.0/CMakeLists.txt.patch"
|
||||
- patch_file: "patches/13.0.0/pugixml-fix.patch"
|
||||
- patch_file: "patches/13.0.0/FindPkgMacros.cmake.patch"
|
||||
- patch_file: "patches/13.0.1/FixFindOpenGLES2.cmake.patch"
|
||||
"13.0.1":
|
||||
- patch_file: "patches/13.0.1/CMakeLists.txt.patch"
|
||||
- patch_file: "patches/13.0.1/pugixml-fix.patch"
|
||||
- patch_file: "patches/13.0.1/FindPkgMacros.cmake.patch"
|
||||
- patch_file: "patches/13.0.1/FixFindOpenGLES2.cmake.patch"
|
||||
"13.2.0":
|
||||
- patch_file: "patches/13.2.0/CMakeLists.txt.patch"
|
||||
- patch_file: "patches/13.2.0/pugixml-fix.patch"
|
||||
- patch_file: "patches/13.2.0/FindPkgMacros.cmake.patch"
|
||||
requirements:
|
||||
- "zlib/[1.x]"
|
||||
- "zziplib/[0.13.x]"
|
||||
|
@ -21,6 +21,10 @@ class OGREConan(ConanFile):
|
||||
installer = SystemPackageTool()
|
||||
installer.install("libx11-dev")
|
||||
installer.install("libxaw7-dev")
|
||||
installer.install("libxrandr-dev")
|
||||
installer.install("libgles2-mesa-dev")
|
||||
installer.install("libvulkan-dev")
|
||||
installer.install("glslang-dev")
|
||||
|
||||
def source(self):
|
||||
tools.get(**self.conan_data["sources"][self.version], strip_root=True)
|
||||
|
@ -1,10 +0,0 @@
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -71,6 +71,7 @@
|
||||
|
||||
# Include necessary submodules
|
||||
set(CMAKE_MODULE_PATH
|
||||
+ "${CMAKE_BINARY_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/CMake"
|
||||
"${PROJECT_SOURCE_DIR}/CMake/Utils"
|
||||
"${PROJECT_SOURCE_DIR}/CMake/Packages"
|
@ -1,11 +0,0 @@
|
||||
--- CMake/Packages/FindOpenGLES2.cmake
|
||||
+++ CMake/Packages/FindOpenGLES2.cmake
|
||||
@@ -23,6 +23,8 @@
|
||||
# EGL_INCLUDE_DIR - the EGL include directory
|
||||
# EGL_LIBRARIES - Link these to use EGL
|
||||
|
||||
+include(FindPkgMacros)
|
||||
+
|
||||
IF(APPLE)
|
||||
create_search_paths(/Developer/Platforms)
|
||||
findpkg_framework(OpenGLES2)
|
@ -1,11 +0,0 @@
|
||||
--- 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)
|
@ -1,11 +0,0 @@
|
||||
--- CMake/Packages/FindOpenGLES2.cmake
|
||||
+++ CMake/Packages/FindOpenGLES2.cmake
|
||||
@@ -23,6 +23,8 @@
|
||||
# EGL_INCLUDE_DIR - the EGL include directory
|
||||
# EGL_LIBRARIES - Link these to use EGL
|
||||
|
||||
+include(FindPkgMacros)
|
||||
+
|
||||
IF(APPLE)
|
||||
create_search_paths(/Developer/Platforms)
|
||||
findpkg_framework(OpenGLES2)
|
@ -1,15 +0,0 @@
|
||||
--- 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)
|
@ -1,6 +1,6 @@
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -71,6 +71,7 @@
|
||||
@@ -76,6 +76,7 @@
|
||||
|
||||
# Include necessary submodules
|
||||
set(CMAKE_MODULE_PATH
|
@ -1,9 +1,7 @@
|
||||
versions:
|
||||
"1.11.6.1":
|
||||
folder: "1.11"
|
||||
"13.0.0":
|
||||
folder: "13"
|
||||
"13.0.1":
|
||||
folder: "13"
|
||||
"1.12.13":
|
||||
folder: "1.12"
|
||||
folder: "1.12"
|
||||
"13.2.0":
|
||||
folder: "13"
|
Reference in New Issue
Block a user