From 0f860e2fbdd793dfb6f0cbceb75b66dc1e475633 Mon Sep 17 00:00:00 2001 From: Jan Borsodi Date: Fri, 10 Sep 2010 00:56:22 +0200 Subject: [PATCH] openmw.cfg is now created with a configurable path (via cmake), the default is still "data" --- CMakeLists.txt | 6 +++++- files/openmw.cfg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1cc058ce4..5df6ad5c6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,10 @@ option(USE_AUDIERE "use Audiere for sound" OFF) option(USE_FFMPEG "use ffmpeg for sound" OFF) option(USE_MPG123 "use mpg123 + libsndfile for sound" ON) +# Location of morrowind data files +set(MORROWIND_DATA_FILES "data" + CACHE PATH "location of Morrowind data files") + # We probably support older versions than this. cmake_minimum_required(VERSION 2.6) @@ -236,7 +240,7 @@ configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.linux endif (WIN32) configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg - "${OpenMW_BINARY_DIR}/openmw.cfg" COPYONLY) + "${OpenMW_BINARY_DIR}/openmw.cfg") if (APPLE) set(APPLE_BUNDLE_RESOURCES diff --git a/files/openmw.cfg b/files/openmw.cfg index cd24a94439..e0690803fd 100644 --- a/files/openmw.cfg +++ b/files/openmw.cfg @@ -1,2 +1,2 @@ -data=data +data=${MORROWIND_DATA_FILES}