From e3cf2c86fca1750343c1885311f857f185ee4f2d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Sep 2019 01:07:24 +0100 Subject: gentoo resync : 08.09.2019 --- .../files/3-odamex-0.7.0-wad-search-path.patch | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch (limited to 'games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch') diff --git a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch deleted file mode 100644 index 77fb4e48996e..000000000000 --- a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9af4e992ff9fa10816beba36478c711ac2c8542a Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Thu, 27 Mar 2014 21:17:21 +0100 -Subject: [PATCH 3/4] add odamex.wad install destination to wad search path - ---- - CMakeLists.txt | 9 +++++++++ - common/d_main.cpp | 2 ++ - config.h.in | 6 ++++++ - 3 files changed, 17 insertions(+) - create mode 100644 config.h.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 91d5c50..a06613e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,6 +13,15 @@ - - set(PROJECT_VERSION 0.7.0) - set(PROJECT_COPYRIGHT "2006-2014") -+ -+configure_file ( -+ "${PROJECT_SOURCE_DIR}/config.h.in" -+ "${PROJECT_BINARY_DIR}/config.h" -+ ) -+ -+include_directories( -+ ${PROJECT_BINARY_DIR} -+) - - # Default build type - if(NOT MSVC) -diff --git a/common/d_main.cpp b/common/d_main.cpp -index 31d4f59..be0ffd2 100644 ---- a/common/d_main.cpp -+++ b/common/d_main.cpp -@@ -23,6 +23,7 @@ - //----------------------------------------------------------------------------- - - #include "version.h" -+#include "config.h" - - #include - #include -@@ -506,6 +507,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s - D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator); - D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator); - D_AddSearchDir(dirs, getenv("HOME"), separator); -+ D_AddSearchDir(dirs, CMAKE_WADDIR, separator); - - // [AM] Search additional paths based on platform - D_AddPlatformSearchDirs(dirs); -diff --git a/config.h.in b/config.h.in -new file mode 100644 -index 0000000..e91b3a6 ---- /dev/null -+++ b/config.h.in -@@ -0,0 +1,6 @@ -+#ifndef CONFIG_H -+#define CONFIG_H -+ -+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" -+ -+#endif --- -1.9.1 - -- cgit v1.2.3