From 7131c08ca499d9718bfb916c9f4a72582c4073e2 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 28 Apr 2011 09:39:40 +0200 Subject: [PATCH] moved path.hpp/path.cpp to a new component --- CMakeLists.txt | 12 ++++++++++-- apps/openmw/CMakeLists.txt | 2 +- apps/openmw/engine.cpp | 3 ++- apps/openmw/main.cpp | 3 ++- {apps/openmw => components/files}/path.cpp | 0 {apps/openmw => components/files}/path.hpp | 0 6 files changed, 15 insertions(+), 5 deletions(-) rename {apps/openmw => components/files}/path.cpp (100%) rename {apps/openmw => components/files}/path.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 949a6e522..7d02e50f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,6 +181,14 @@ set(MISC_HEADER ${COMP_DIR}/misc/stringops.hpp) source_group(components\\misc FILES ${MISC} ${MISC_HEADER}) +set(FILES + ${COMP_DIR}/files/path.cpp + ) +set(FILES_HEADER + ${COMP_DIR}/files/path.hpp + ) +source_group(components\\files FILES ${FILES} ${FILES_HEADER}) + file(GLOB COMPILER ${COMP_DIR}/compiler/*.cpp) file(GLOB COMPILER_HEADER ${COMP_DIR}/compiler/*.hpp) source_group(components\\compiler FILES ${COMPILER} ${COMPILER_HEADER}) @@ -190,10 +198,10 @@ file(GLOB INTERPRETER_HEADER ${COMP_DIR}/interpreter/*.hpp) source_group(components\\interpreter FILES ${INTERPRETER} ${INTERPRETER_HEADER}) set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${MISC} ${TO_UTF8} - ${COMPILER} ${INTERPRETER} ${ESM} ${FILE_FINDER} ${NIFBULLET}) + ${COMPILER} ${INTERPRETER} ${ESM} ${FILE_FINDER} ${NIFBULLET} ${FILES}) set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER} ${ESM_HEADER} ${MISC_HEADER} ${COMPILER_HEADER} ${TO_UTF8_HEADER} - ${INTERPRETER_HEADER} ${FILE_FINDER_HEADER} ${NIFBULLET_HEADER}) + ${INTERPRETER_HEADER} ${FILE_FINDER_HEADER} ${NIFBULLET_HEADER} ${FILES_HEADER}) # source directory: libs diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 0fa027f0c..9bc27b16d 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -5,7 +5,7 @@ project(OpenMW) set(GAME main.cpp engine.cpp - path.cpp) + ) set(GAME_HEADER engine.hpp) source_group(game FILES ${GAME} ${GAME_HEADER}) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 78ddffbe8..39ab43008 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -14,6 +14,8 @@ #include #include #include +#include + #include #include "mwgui/window_manager.hpp" @@ -47,7 +49,6 @@ #include #include "mwgui/class.hpp" -#include "path.hpp" #include "components/nifbullet/bullet_nif_loader.hpp" diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index 7ba3fb4d6..754627602 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -6,8 +6,9 @@ #include #include +#include + #include "engine.hpp" -#include "path.hpp" #if defined(_WIN32) && !defined(_CONSOLE) #include diff --git a/apps/openmw/path.cpp b/components/files/path.cpp similarity index 100% rename from apps/openmw/path.cpp rename to components/files/path.cpp diff --git a/apps/openmw/path.hpp b/components/files/path.hpp similarity index 100% rename from apps/openmw/path.hpp rename to components/files/path.hpp