From bd072b131bf62999a4614b535cb02925e03db7f9 Mon Sep 17 00:00:00 2001 From: Thunderforge Date: Tue, 2 Jan 2018 20:58:43 -0600 Subject: [PATCH] Moving controller file out of the controllers subdirectory --- CMakeLists.txt | 30 +++++++++---------- apps/openmw/CMakeLists.txt | 6 ++-- apps/openmw/engine.cpp | 4 +-- files/{controllers => }/gamecontrollerdb.txt | 0 .../gamecontrollerdb_204.txt | 0 .../gamecontrollerdb_205.txt | 0 6 files changed, 20 insertions(+), 20 deletions(-) rename files/{controllers => }/gamecontrollerdb.txt (100%) rename files/{controllers => }/gamecontrollerdb_204.txt (100%) rename files/{controllers => }/gamecontrollerdb_205.txt (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ffc504bec..2923612fba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,14 +325,14 @@ configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg copy_resource_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters "${OpenMW_BINARY_DIR}" "resources/defaultfilters") -configure_resource_file(${OpenMW_SOURCE_DIR}/files/controllers/gamecontrollerdb.txt - "${OpenMW_BINARY_DIR}" "controllers/gamecontrollerdb.txt") +configure_resource_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb.txt + "${OpenMW_BINARY_DIR}" "gamecontrollerdb.txt") -configure_resource_file(${OpenMW_SOURCE_DIR}/files/controllers/gamecontrollerdb_204.txt - "${OpenMW_BINARY_DIR}" "controllers/gamecontrollerdb_204.txt") +configure_resource_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb_204.txt + "${OpenMW_BINARY_DIR}" "gamecontrollerdb_204.txt") -configure_resource_file(${OpenMW_SOURCE_DIR}/files/controllers/gamecontrollerdb_205.txt - "${OpenMW_BINARY_DIR}" "controllers/gamecontrollerdb_205.txt") +configure_resource_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb_205.txt + "${OpenMW_BINARY_DIR}" "gamecontrollerdb_205.txt") if (NOT WIN32 AND NOT APPLE) configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop @@ -426,9 +426,9 @@ IF(NOT WIN32 AND NOT APPLE) INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" COMPONENT "openmw") INSTALL(FILES "${OpenMW_BINARY_DIR}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") - INSTALL(FILES "${OpenMW_BINARY_DIR}/controllers/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") - INSTALL(FILES "${OpenMW_BINARY_DIR}/controllers/gamecontrollerdb_204.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") - INSTALL(FILES "${OpenMW_BINARY_DIR}/controllers/gamecontrollerdb_205.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") + INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") + INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb_204.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") + INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb_205.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw") IF(BUILD_OPENCS) INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs") @@ -454,12 +454,12 @@ if(WIN32) DESTINATION ".") INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/settings-default.cfg" DESTINATION "." CONFIGURATIONS Debug) INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/settings-default.cfg" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) - INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/controllers/gamecontrollerdb.txt" DESTINATION "." CONFIGURATIONS Debug) - INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/controllers/gamecontrollerdb.txt" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) - INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/controllers/gamecontrollerdb_204.txt" DESTINATION "." CONFIGURATIONS Debug) - INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/controllers/gamecontrollerdb_204.txt" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) - INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/controllers/gamecontrollerdb_205.txt" DESTINATION "." CONFIGURATIONS Debug) - INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/controllers/gamecontrollerdb_205.txt" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) + INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/gamecontrollerdb.txt" DESTINATION "." CONFIGURATIONS Debug) + INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/gamecontrollerdb.txt" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) + INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/gamecontrollerdb_204.txt" DESTINATION "." CONFIGURATIONS Debug) + INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/gamecontrollerdb_204.txt" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) + INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/gamecontrollerdb_205.txt" DESTINATION "." CONFIGURATIONS Debug) + INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/gamecontrollerdb_205.txt" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel) if(BUILD_MYGUI_PLUGIN) INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Debug/Plugin_MyGUI_OpenMW_Resources.dll" DESTINATION "." CONFIGURATIONS Debug) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 6579212c72..4913943247 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -189,9 +189,9 @@ if(APPLE) configure_file("${OpenMW_BINARY_DIR}/settings-default.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY) configure_file("${OpenMW_BINARY_DIR}/openmw.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY) - configure_file("${OpenMW_BINARY_DIR}/controllers/gamecontrollerdb.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY) - configure_file("${OpenMW_BINARY_DIR}/controllers/gamecontrollerdb_204.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY) - configure_file("${OpenMW_BINARY_DIR}/controllers/gamecontrollerdb_205.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY) + configure_file("${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY) + configure_file("${OpenMW_BINARY_DIR}/gamecontrollerdb_204.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY) + configure_file("${OpenMW_BINARY_DIR}/gamecontrollerdb_205.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY) add_custom_command(TARGET openmw POST_BUILD diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 38146b5273..78e368cfcc 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -489,8 +489,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings) controllerFileName = "gamecontrollerdb.txt"; } - const std::string localdefault = mCfgMgr.getLocalPath().string() + "/controllers/" + controllerFileName; - const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/controllers/" + controllerFileName; + const std::string localdefault = mCfgMgr.getLocalPath().string() + "/" + controllerFileName; + const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/" + controllerFileName; std::string gameControllerdb; if (boost::filesystem::exists(localdefault)) gameControllerdb = localdefault; diff --git a/files/controllers/gamecontrollerdb.txt b/files/gamecontrollerdb.txt similarity index 100% rename from files/controllers/gamecontrollerdb.txt rename to files/gamecontrollerdb.txt diff --git a/files/controllers/gamecontrollerdb_204.txt b/files/gamecontrollerdb_204.txt similarity index 100% rename from files/controllers/gamecontrollerdb_204.txt rename to files/gamecontrollerdb_204.txt diff --git a/files/controllers/gamecontrollerdb_205.txt b/files/gamecontrollerdb_205.txt similarity index 100% rename from files/controllers/gamecontrollerdb_205.txt rename to files/gamecontrollerdb_205.txt