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

🎉 Added OGRE 2.3

Browse Source
This commit is contained in:
Edgar
2022-11-09 09:56:09 +01:00
parent 06c8dbc79b
commit c45516ad8e
4 changed files with 151 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ogre/2.3/patches/2.3.1/FindPkgMacros.cmake.patch Normal file
View 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)

11
ogre/2.3/patches/2.3.1/RapidJSON-fix.patch Normal file
View File

@@ -0,0 +1,11 @@
--- OgreMain/CMakeLists.txt
+++ OgreMain/CMakeLists.txt
@@ -475,7 +475,7 @@
set_target_properties(OgreMain PROPERTIES OUTPUT_NAME Ogre)
endif ()
endif ()
-target_link_libraries(OgreMain ${LIBRARIES})
+target_link_libraries(OgreMain ${LIBRARIES} RapidJSON::RapidJSON freeimage::FreeImage)
if (MINGW)
# may need winsock htons functions for FreeImage
target_link_libraries(OgreMain ws2_32)