From fde3e5f3b615c336ed8a5706e2130a6029fc63c2 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 3 Nov 2018 18:16:14 +0100 Subject: [PATCH] - moved binfile and halffloat to framework --- CMakeLists.txt | 9 ++++----- src/{lightmap/kexlib => framework}/binfile.cpp | 2 +- src/{lightmap/kexlib => framework}/binfile.h | 0 src/{lightmap => framework}/halffloat.cpp | 0 src/{lightmap => framework}/halffloat.h | 0 src/lightmap/lightmap.cpp | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) rename src/{lightmap/kexlib => framework}/binfile.cpp (98%) rename src/{lightmap/kexlib => framework}/binfile.h (100%) rename src/{lightmap => framework}/halffloat.cpp (100%) rename src/{lightmap => framework}/halffloat.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec424c6..43a341b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,6 +133,8 @@ set( SOURCES src/main.cpp src/commandline/getopt.c src/commandline/getopt1.c + src/framework/halffloat.cpp + src/framework/binfile.cpp src/blockmapbuilder/blockmapbuilder.cpp src/level/level.cpp src/level/level_udmf.cpp @@ -151,8 +153,6 @@ set( SOURCES src/lightmap/trace.cpp src/lightmap/worker.cpp src/lightmap/collision.cpp - src/lightmap/halffloat.cpp - src/lightmap/kexlib/binfile.cpp src/math/angle.cpp src/math/bounds.cpp src/math/mathlib.cpp @@ -183,6 +183,8 @@ set( HEADERS src/framework/templates.h src/framework/zdray.h src/framework/xs_Float.h + src/framework/halffloat.h + src/framework/binfile.h src/lightmap/lightmap.h src/lightmap/lightsurface.h src/lightmap/mapdata.h @@ -190,8 +192,6 @@ set( HEADERS src/lightmap/trace.h src/lightmap/worker.h src/lightmap/collision.h - src/lightmap/halffloat.h - src/lightmap/kexlib/binfile.h src/math/mathlib.h ) @@ -264,4 +264,3 @@ source_group("Sources\\Viewer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/ source_group("Sources\\Wad" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/src/wad/.+") source_group("Sources\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/src/math/.+") source_group("Sources\\Lightmap" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/src/lightmap/.+") -source_group("Sources\\Lightmap\\kexlib" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/src/lightmap/kexlib/.+") diff --git a/src/lightmap/kexlib/binfile.cpp b/src/framework/binfile.cpp similarity index 98% rename from src/lightmap/kexlib/binfile.cpp rename to src/framework/binfile.cpp index 61752f2..dcc69bf 100644 --- a/src/lightmap/kexlib/binfile.cpp +++ b/src/framework/binfile.cpp @@ -30,7 +30,7 @@ // //----------------------------------------------------------------------------- -#include "lightmap/kexlib/binfile.h" +#include "framework/binfile.h" typedef union { diff --git a/src/lightmap/kexlib/binfile.h b/src/framework/binfile.h similarity index 100% rename from src/lightmap/kexlib/binfile.h rename to src/framework/binfile.h diff --git a/src/lightmap/halffloat.cpp b/src/framework/halffloat.cpp similarity index 100% rename from src/lightmap/halffloat.cpp rename to src/framework/halffloat.cpp diff --git a/src/lightmap/halffloat.h b/src/framework/halffloat.h similarity index 100% rename from src/lightmap/halffloat.h rename to src/framework/halffloat.h diff --git a/src/lightmap/lightmap.cpp b/src/lightmap/lightmap.cpp index 400117a..ab7bb40 100644 --- a/src/lightmap/lightmap.cpp +++ b/src/lightmap/lightmap.cpp @@ -36,9 +36,9 @@ #include "mapdata.h" #include "lightmap.h" #include "worker.h" -#include "kexlib/binfile.h" +#include "framework/binfile.h" #include "framework/templates.h" -#include "halffloat.h" +#include "framework/halffloat.h" #include #include #include