hasufell 14/11/05 19:37:37
Added: ogre-1.9.0-remove_resource_path_to_bindir.patch
ogre-1.9.0-remove_media_path_to_bindir.patch
Log:
fix bug #506058, thanks to Sven Eden
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.1
dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch?rev=1.1&content-type=text/plain
Index: ogre-1.9.0-remove_resource_path_to_bindir.patch
===================================================================
--- a/CMake/InstallResources.cmake 2013-12-01 18:28:12.000000000 +0100
+++ b/CMake/InstallResources.cmake 2014-10-29 12:38:29.963602465 +0100
@@ -201,11 +201,6 @@
set(OGRE_PLUGIN_DIR_DBG "")
set(OGRE_SAMPLES_DIR_REL "")
set(OGRE_SAMPLES_DIR_DBG "")
-elseif (UNIX)
- set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
- set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
- set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
- set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
endif ()
if (MSVC AND NOT NMAKE)
1.1
dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch?rev=1.1&content-type=text/plain
Index: ogre-1.9.0-remove_media_path_to_bindir.patch
===================================================================
--- a/CMake/InstallResources.cmake 2014-10-29 12:43:49.000000000 +0100
+++ b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100
@@ -178,10 +178,6 @@
# CREATE CONFIG FILES - BUILD DIR VERSIONS
if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
- set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
- set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
else ()
# iOS needs to use relative paths in the config files
set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
