From 010bc54e7940df3d5de78a437149fa7b1f27aac2 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 11 Oct 2024 12:35:11 +0200 Subject: [PATCH] remove WOOFDATADIR macro (#1958) Unused for its original purpose --- CMakeLists.txt | 4 ---- config.h.in | 1 - src/d_iwad.c | 5 ----- 3 files changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71f04401..9bf57aa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,10 +44,6 @@ set(WOOF_ICON "woof.ico") set(SETUP_ICON "setup.ico") set(PROJECT_VERSION_RC "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0") # ${PROJECT_VERSION_TWEAK} -if(NOT WIN32) - set(WOOFDATADIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_SHORTNAME}" CACHE PATH "Path to install supplemental files") -endif() - # Toggle-able defines added at compile-time. option(WOOF_RANGECHECK "Enable bounds-checking of performance-sensitive functions" ON) option(WOOF_STRICT "Prefer original MBF code paths over demo compatiblity with PrBoom+" OFF) diff --git a/config.h.in b/config.h.in index 26e6b2db..11cde77c 100644 --- a/config.h.in +++ b/config.h.in @@ -13,4 +13,3 @@ #cmakedefine HAVE_LIBXMP #cmakedefine HAVE_SNDFILE_MPEG #cmakedefine HAVE_AL_BUFFER_CALLBACK -#cmakedefine WOOFDATADIR "@WOOFDATADIR@" diff --git a/src/d_iwad.c b/src/d_iwad.c index 60b825ef..040aee3b 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -606,11 +606,6 @@ void BuildIWADDirList(void) AddIWADDir(env); } -#if defined(WOOFDATADIR) - // [FG] Add a build-time configurable data directory - AddIWADDir(WOOFDATADIR); -#endif - #ifdef _WIN32 // Search the registry and find where IWADs have been installed.