From 7241072b16d0409ce646c2a8ffeb0fba57f034bc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 31 Jan 2019 20:33:52 +0100 Subject: [PATCH] - moved most utility code to a subdirectory. Again no code changes. --- src/CMakeLists.txt | 86 ++++++++++--------- src/{ => utility}/ctpl.h | 0 src/{ => utility}/earcut.hpp | 0 src/{ => utility}/files.cpp | 0 src/{ => utility}/files.h | 0 src/{ => utility}/files_decompress.cpp | 0 src/{ => utility}/m_png.cpp | 0 src/{ => utility}/m_png.h | 0 src/{ => utility}/m_random.cpp | 0 src/{ => utility}/m_random.h | 0 src/{ => utility}/m_swap.h | 0 src/{ => utility}/math/asin.c | 0 src/{ => utility}/math/atan.c | 0 src/{ => utility}/math/cmath.h | 0 src/{ => utility}/math/const.c | 0 src/{ => utility}/math/cosh.c | 0 src/{ => utility}/math/exp.c | 0 src/{ => utility}/math/fastsin.cpp | 0 src/{ => utility}/math/isnan.c | 0 src/{ => utility}/math/log.c | 0 src/{ => utility}/math/log10.c | 0 src/{ => utility}/math/mconf.h | 0 src/{ => utility}/math/mtherr.c | 0 src/{ => utility}/math/polevl.c | 0 src/{ => utility}/math/pow.c | 0 src/{ => utility}/math/powi.c | 0 src/{ => utility}/math/readme.txt | 0 src/{ => utility}/math/sin.c | 0 src/{ => utility}/math/sinh.c | 0 src/{ => utility}/math/sqrt.c | 0 src/{ => utility}/math/tan.c | 0 src/{ => utility}/math/tanh.c | 0 src/{ => utility}/md5.cpp | 0 src/{ => utility}/md5.h | 0 src/{ => utility}/memarena.cpp | 0 src/{ => utility}/memarena.h | 0 src/{ => utility/nodebuilder}/nodebuild.cpp | 0 src/{ => utility/nodebuilder}/nodebuild.h | 0 .../nodebuild_classify_nosse2.cpp | 0 .../nodebuilder}/nodebuild_events.cpp | 0 .../nodebuilder}/nodebuild_extract.cpp | 0 .../nodebuilder}/nodebuild_gl.cpp | 0 .../nodebuilder}/nodebuild_utility.cpp | 0 src/{ => utility}/parallel_for.h | 0 src/{ => utility}/rapidjson/allocators.h | 0 src/{ => utility}/rapidjson/document.h | 0 src/{ => utility}/rapidjson/encodedstream.h | 0 src/{ => utility}/rapidjson/encodings.h | 0 src/{ => utility}/rapidjson/error/en.h | 0 src/{ => utility}/rapidjson/error/error.h | 0 src/{ => utility}/rapidjson/filereadstream.h | 0 src/{ => utility}/rapidjson/filewritestream.h | 0 src/{ => utility}/rapidjson/fwd.h | 0 .../rapidjson/internal/biginteger.h | 0 src/{ => utility}/rapidjson/internal/diyfp.h | 0 src/{ => utility}/rapidjson/internal/dtoa.h | 0 .../rapidjson/internal/ieee754.h | 0 src/{ => utility}/rapidjson/internal/itoa.h | 0 src/{ => utility}/rapidjson/internal/meta.h | 0 src/{ => utility}/rapidjson/internal/pow10.h | 0 src/{ => utility}/rapidjson/internal/regex.h | 0 src/{ => utility}/rapidjson/internal/stack.h | 0 .../rapidjson/internal/strfunc.h | 0 src/{ => utility}/rapidjson/internal/strtod.h | 0 src/{ => utility}/rapidjson/internal/swap.h | 0 src/{ => utility}/rapidjson/istreamwrapper.h | 0 src/{ => utility}/rapidjson/memorybuffer.h | 0 src/{ => utility}/rapidjson/memorystream.h | 0 .../rapidjson/msinttypes/inttypes.h | 0 .../rapidjson/msinttypes/stdint.h | 0 src/{ => utility}/rapidjson/ostreamwrapper.h | 0 src/{ => utility}/rapidjson/pointer.h | 0 src/{ => utility}/rapidjson/prettywriter.h | 0 src/{ => utility}/rapidjson/rapidjson.h | 0 src/{ => utility}/rapidjson/reader.h | 0 src/{ => utility}/rapidjson/schema.h | 0 src/{ => utility}/rapidjson/stream.h | 0 src/{ => utility}/rapidjson/stringbuffer.h | 0 src/{ => utility}/rapidjson/writer.h | 0 src/{ => utility}/sc_man.cpp | 0 src/{ => utility}/sc_man.h | 0 src/{ => utility}/sc_man_scanner.re | 0 src/{ => utility}/sc_man_tokens.h | 0 src/{ => utility}/sfmt/LICENSE.txt | 0 src/{ => utility}/sfmt/SFMT-alti.h | 0 src/{ => utility}/sfmt/SFMT-params.h | 0 src/{ => utility}/sfmt/SFMT-params11213.h | 0 src/{ => utility}/sfmt/SFMT-params1279.h | 0 src/{ => utility}/sfmt/SFMT-params132049.h | 0 src/{ => utility}/sfmt/SFMT-params19937.h | 0 src/{ => utility}/sfmt/SFMT-params216091.h | 0 src/{ => utility}/sfmt/SFMT-params2281.h | 0 src/{ => utility}/sfmt/SFMT-params4253.h | 0 src/{ => utility}/sfmt/SFMT-params44497.h | 0 src/{ => utility}/sfmt/SFMT-params607.h | 0 src/{ => utility}/sfmt/SFMT-params86243.h | 0 src/{ => utility}/sfmt/SFMT-sse2.h | 0 src/{ => utility}/sfmt/SFMT.cpp | 0 src/{ => utility}/sfmt/SFMT.h | 0 src/{ => utility}/strnatcmp.c | 0 src/{ => utility}/strnatcmp.h | 0 src/{ => utility}/xs_Float.h | 0 102 files changed, 46 insertions(+), 40 deletions(-) rename src/{ => utility}/ctpl.h (100%) rename src/{ => utility}/earcut.hpp (100%) rename src/{ => utility}/files.cpp (100%) rename src/{ => utility}/files.h (100%) rename src/{ => utility}/files_decompress.cpp (100%) rename src/{ => utility}/m_png.cpp (100%) rename src/{ => utility}/m_png.h (100%) rename src/{ => utility}/m_random.cpp (100%) rename src/{ => utility}/m_random.h (100%) rename src/{ => utility}/m_swap.h (100%) rename src/{ => utility}/math/asin.c (100%) rename src/{ => utility}/math/atan.c (100%) rename src/{ => utility}/math/cmath.h (100%) rename src/{ => utility}/math/const.c (100%) rename src/{ => utility}/math/cosh.c (100%) rename src/{ => utility}/math/exp.c (100%) rename src/{ => utility}/math/fastsin.cpp (100%) rename src/{ => utility}/math/isnan.c (100%) rename src/{ => utility}/math/log.c (100%) rename src/{ => utility}/math/log10.c (100%) rename src/{ => utility}/math/mconf.h (100%) rename src/{ => utility}/math/mtherr.c (100%) rename src/{ => utility}/math/polevl.c (100%) rename src/{ => utility}/math/pow.c (100%) rename src/{ => utility}/math/powi.c (100%) rename src/{ => utility}/math/readme.txt (100%) rename src/{ => utility}/math/sin.c (100%) rename src/{ => utility}/math/sinh.c (100%) rename src/{ => utility}/math/sqrt.c (100%) rename src/{ => utility}/math/tan.c (100%) rename src/{ => utility}/math/tanh.c (100%) rename src/{ => utility}/md5.cpp (100%) rename src/{ => utility}/md5.h (100%) rename src/{ => utility}/memarena.cpp (100%) rename src/{ => utility}/memarena.h (100%) rename src/{ => utility/nodebuilder}/nodebuild.cpp (100%) rename src/{ => utility/nodebuilder}/nodebuild.h (100%) rename src/{ => utility/nodebuilder}/nodebuild_classify_nosse2.cpp (100%) rename src/{ => utility/nodebuilder}/nodebuild_events.cpp (100%) rename src/{ => utility/nodebuilder}/nodebuild_extract.cpp (100%) rename src/{ => utility/nodebuilder}/nodebuild_gl.cpp (100%) rename src/{ => utility/nodebuilder}/nodebuild_utility.cpp (100%) rename src/{ => utility}/parallel_for.h (100%) rename src/{ => utility}/rapidjson/allocators.h (100%) rename src/{ => utility}/rapidjson/document.h (100%) rename src/{ => utility}/rapidjson/encodedstream.h (100%) rename src/{ => utility}/rapidjson/encodings.h (100%) rename src/{ => utility}/rapidjson/error/en.h (100%) rename src/{ => utility}/rapidjson/error/error.h (100%) rename src/{ => utility}/rapidjson/filereadstream.h (100%) rename src/{ => utility}/rapidjson/filewritestream.h (100%) rename src/{ => utility}/rapidjson/fwd.h (100%) rename src/{ => utility}/rapidjson/internal/biginteger.h (100%) rename src/{ => utility}/rapidjson/internal/diyfp.h (100%) rename src/{ => utility}/rapidjson/internal/dtoa.h (100%) rename src/{ => utility}/rapidjson/internal/ieee754.h (100%) rename src/{ => utility}/rapidjson/internal/itoa.h (100%) rename src/{ => utility}/rapidjson/internal/meta.h (100%) rename src/{ => utility}/rapidjson/internal/pow10.h (100%) rename src/{ => utility}/rapidjson/internal/regex.h (100%) rename src/{ => utility}/rapidjson/internal/stack.h (100%) rename src/{ => utility}/rapidjson/internal/strfunc.h (100%) rename src/{ => utility}/rapidjson/internal/strtod.h (100%) rename src/{ => utility}/rapidjson/internal/swap.h (100%) rename src/{ => utility}/rapidjson/istreamwrapper.h (100%) rename src/{ => utility}/rapidjson/memorybuffer.h (100%) rename src/{ => utility}/rapidjson/memorystream.h (100%) rename src/{ => utility}/rapidjson/msinttypes/inttypes.h (100%) rename src/{ => utility}/rapidjson/msinttypes/stdint.h (100%) rename src/{ => utility}/rapidjson/ostreamwrapper.h (100%) rename src/{ => utility}/rapidjson/pointer.h (100%) rename src/{ => utility}/rapidjson/prettywriter.h (100%) rename src/{ => utility}/rapidjson/rapidjson.h (100%) rename src/{ => utility}/rapidjson/reader.h (100%) rename src/{ => utility}/rapidjson/schema.h (100%) rename src/{ => utility}/rapidjson/stream.h (100%) rename src/{ => utility}/rapidjson/stringbuffer.h (100%) rename src/{ => utility}/rapidjson/writer.h (100%) rename src/{ => utility}/sc_man.cpp (100%) rename src/{ => utility}/sc_man.h (100%) rename src/{ => utility}/sc_man_scanner.re (100%) rename src/{ => utility}/sc_man_tokens.h (100%) rename src/{ => utility}/sfmt/LICENSE.txt (100%) rename src/{ => utility}/sfmt/SFMT-alti.h (100%) rename src/{ => utility}/sfmt/SFMT-params.h (100%) rename src/{ => utility}/sfmt/SFMT-params11213.h (100%) rename src/{ => utility}/sfmt/SFMT-params1279.h (100%) rename src/{ => utility}/sfmt/SFMT-params132049.h (100%) rename src/{ => utility}/sfmt/SFMT-params19937.h (100%) rename src/{ => utility}/sfmt/SFMT-params216091.h (100%) rename src/{ => utility}/sfmt/SFMT-params2281.h (100%) rename src/{ => utility}/sfmt/SFMT-params4253.h (100%) rename src/{ => utility}/sfmt/SFMT-params44497.h (100%) rename src/{ => utility}/sfmt/SFMT-params607.h (100%) rename src/{ => utility}/sfmt/SFMT-params86243.h (100%) rename src/{ => utility}/sfmt/SFMT-sse2.h (100%) rename src/{ => utility}/sfmt/SFMT.cpp (100%) rename src/{ => utility}/sfmt/SFMT.h (100%) rename src/{ => utility}/strnatcmp.c (100%) rename src/{ => utility}/strnatcmp.h (100%) rename src/{ => utility}/xs_Float.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1f6b54a5a8..e9c8e9ae9b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -605,8 +605,8 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRE DEPENDS lemon ${CMAKE_CURRENT_SOURCE_DIR}/scripting/zscript/zcc-parse.lemon ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h - COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/sc_man_scanner.re - DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/sc_man_scanner.re ) + COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/utility/sc_man_scanner.re + DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/utility/sc_man_scanner.re ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) @@ -661,9 +661,11 @@ file( GLOB HEADER_FILES win32/*.h r_data/*.h r_data/models/*.h - rapidjson/*.h + utility/rapidjson/*.h resourcefiles/*.h - sfmt/*.h + utility/sfmt/*.h + utility/math./*h + utility/*.h sound/*.h textures/*.h textures/hires/hqnx/*.h @@ -790,7 +792,7 @@ set( NOT_COMPILED_SOURCE_FILES ${SWRENDER_SOURCES} ${POLYRENDER_SOURCES} sc_man_scanner.h - sc_man_scanner.re + utility/sc_man_scanner.re g_statusbar/sbarinfo_commands.cpp xlat/xlat_parser.y xlat_parser.c @@ -909,8 +911,6 @@ set (PCH_SOURCES dsectoreffect.cpp dthinker.cpp f_wipe.cpp - files.cpp - files_decompress.cpp g_cvars.cpp g_doomedmap.cpp g_dumpinfo.cpp @@ -934,17 +934,7 @@ set (PCH_SOURCES m_cheat.cpp m_joy.cpp m_misc.cpp - m_png.cpp - m_random.cpp - memarena.cpp - md5.cpp name.cpp - nodebuild.cpp - nodebuild_classify_nosse2.cpp - nodebuild_events.cpp - nodebuild_extract.cpp - nodebuild_gl.cpp - nodebuild_utility.cpp p_3dfloors.cpp p_3dmidtex.cpp p_acs.cpp @@ -990,7 +980,6 @@ set (PCH_SOURCES s_sndseq.cpp s_sound.cpp serializer.cpp - sc_man.cpp scriptutil.cpp st_stuff.cpp statistics.cpp @@ -1191,7 +1180,7 @@ set (PCH_SOURCES scripting/zscript/ast.cpp scripting/zscript/zcc_compile.cpp scripting/zscript/zcc_parser.cpp - sfmt/SFMT.cpp + utility/sfmt/SFMT.cpp sound/i_music.cpp sound/i_sound.cpp sound/i_soundfont.cpp @@ -1260,6 +1249,19 @@ set (PCH_SOURCES rendering/swrenderer/textures/warptexture.cpp rendering/swrenderer/textures/swcanvastexture.cpp events.cpp + utility/files.cpp + utility/files_decompress.cpp + utility/m_png.cpp + utility/m_random.cpp + utility/memarena.cpp + utility/md5.cpp + utility/nodebuilder/nodebuild.cpp + utility/nodebuilder/nodebuild_classify_nosse2.cpp + utility/nodebuilder/nodebuild_events.cpp + utility/nodebuilder/nodebuild_extract.cpp + utility/nodebuilder/nodebuild_gl.cpp + utility/nodebuilder/nodebuild_utility.cpp + utility/sc_man.cpp ) enable_precompiled_headers( g_pch.h PCH_SOURCES ) @@ -1273,32 +1275,32 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE ${FASTMATH_SOURCES} ${PCH_SOURCES} x86.cpp - strnatcmp.c + utility/strnatcmp.c zstring.cpp - math/asin.c - math/atan.c - math/const.c - math/cosh.c - math/exp.c - math/isnan.c - math/log.c - math/log10.c - math/mtherr.c - math/polevl.c - math/pow.c - math/powi.c - math/sin.c - math/sinh.c - math/sqrt.c - math/tan.c - math/tanh.c - math/fastsin.cpp + utility/math/asin.c + utility/math/atan.c + utility/math/const.c + utility/math/cosh.c + utility/math/exp.c + utility/math/isnan.c + utility/math/log.c + utility/math/log10.c + utility/math/mtherr.c + utility/math/polevl.c + utility/math/pow.c + utility/math/powi.c + utility/math/sin.c + utility/math/sinh.c + utility/math/sqrt.c + utility/math/tan.c + utility/math/tanh.c + utility/math/fastsin.cpp zzautozend.cpp ) set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${ZD_FASTMATH_FLAG} ) set_source_files_properties( xlat/parse_xlat.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c" ) -set_source_files_properties( sc_man.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h" ) +set_source_files_properties( utility/sc_man.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h" ) set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE ) @@ -1327,6 +1329,8 @@ include_directories( . sound/timidity sound/wildmidi xlat + utility + utility/nodebuilder scripting scripting/vm ../gdtoa @@ -1493,8 +1497,10 @@ source_group("Scripting\\ZScript frontend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_ source_group("Scripting\\Compiler backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/backend/.+") source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/vm/.+") source_group("Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/.+") +source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/.+") +source_group("Utility\\Node Builder" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/nodebuilder/.+") source_group("Shared Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_shared/.+") source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+") source_group("Versioning" FILES version.h win32/zdoom.rc) source_group("Xlat" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/xlat/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h) -source_group("Source Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h sc_man_scanner.re) +source_group("Source Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h utility/sc_man_scanner.re) diff --git a/src/ctpl.h b/src/utility/ctpl.h similarity index 100% rename from src/ctpl.h rename to src/utility/ctpl.h diff --git a/src/earcut.hpp b/src/utility/earcut.hpp similarity index 100% rename from src/earcut.hpp rename to src/utility/earcut.hpp diff --git a/src/files.cpp b/src/utility/files.cpp similarity index 100% rename from src/files.cpp rename to src/utility/files.cpp diff --git a/src/files.h b/src/utility/files.h similarity index 100% rename from src/files.h rename to src/utility/files.h diff --git a/src/files_decompress.cpp b/src/utility/files_decompress.cpp similarity index 100% rename from src/files_decompress.cpp rename to src/utility/files_decompress.cpp diff --git a/src/m_png.cpp b/src/utility/m_png.cpp similarity index 100% rename from src/m_png.cpp rename to src/utility/m_png.cpp diff --git a/src/m_png.h b/src/utility/m_png.h similarity index 100% rename from src/m_png.h rename to src/utility/m_png.h diff --git a/src/m_random.cpp b/src/utility/m_random.cpp similarity index 100% rename from src/m_random.cpp rename to src/utility/m_random.cpp diff --git a/src/m_random.h b/src/utility/m_random.h similarity index 100% rename from src/m_random.h rename to src/utility/m_random.h diff --git a/src/m_swap.h b/src/utility/m_swap.h similarity index 100% rename from src/m_swap.h rename to src/utility/m_swap.h diff --git a/src/math/asin.c b/src/utility/math/asin.c similarity index 100% rename from src/math/asin.c rename to src/utility/math/asin.c diff --git a/src/math/atan.c b/src/utility/math/atan.c similarity index 100% rename from src/math/atan.c rename to src/utility/math/atan.c diff --git a/src/math/cmath.h b/src/utility/math/cmath.h similarity index 100% rename from src/math/cmath.h rename to src/utility/math/cmath.h diff --git a/src/math/const.c b/src/utility/math/const.c similarity index 100% rename from src/math/const.c rename to src/utility/math/const.c diff --git a/src/math/cosh.c b/src/utility/math/cosh.c similarity index 100% rename from src/math/cosh.c rename to src/utility/math/cosh.c diff --git a/src/math/exp.c b/src/utility/math/exp.c similarity index 100% rename from src/math/exp.c rename to src/utility/math/exp.c diff --git a/src/math/fastsin.cpp b/src/utility/math/fastsin.cpp similarity index 100% rename from src/math/fastsin.cpp rename to src/utility/math/fastsin.cpp diff --git a/src/math/isnan.c b/src/utility/math/isnan.c similarity index 100% rename from src/math/isnan.c rename to src/utility/math/isnan.c diff --git a/src/math/log.c b/src/utility/math/log.c similarity index 100% rename from src/math/log.c rename to src/utility/math/log.c diff --git a/src/math/log10.c b/src/utility/math/log10.c similarity index 100% rename from src/math/log10.c rename to src/utility/math/log10.c diff --git a/src/math/mconf.h b/src/utility/math/mconf.h similarity index 100% rename from src/math/mconf.h rename to src/utility/math/mconf.h diff --git a/src/math/mtherr.c b/src/utility/math/mtherr.c similarity index 100% rename from src/math/mtherr.c rename to src/utility/math/mtherr.c diff --git a/src/math/polevl.c b/src/utility/math/polevl.c similarity index 100% rename from src/math/polevl.c rename to src/utility/math/polevl.c diff --git a/src/math/pow.c b/src/utility/math/pow.c similarity index 100% rename from src/math/pow.c rename to src/utility/math/pow.c diff --git a/src/math/powi.c b/src/utility/math/powi.c similarity index 100% rename from src/math/powi.c rename to src/utility/math/powi.c diff --git a/src/math/readme.txt b/src/utility/math/readme.txt similarity index 100% rename from src/math/readme.txt rename to src/utility/math/readme.txt diff --git a/src/math/sin.c b/src/utility/math/sin.c similarity index 100% rename from src/math/sin.c rename to src/utility/math/sin.c diff --git a/src/math/sinh.c b/src/utility/math/sinh.c similarity index 100% rename from src/math/sinh.c rename to src/utility/math/sinh.c diff --git a/src/math/sqrt.c b/src/utility/math/sqrt.c similarity index 100% rename from src/math/sqrt.c rename to src/utility/math/sqrt.c diff --git a/src/math/tan.c b/src/utility/math/tan.c similarity index 100% rename from src/math/tan.c rename to src/utility/math/tan.c diff --git a/src/math/tanh.c b/src/utility/math/tanh.c similarity index 100% rename from src/math/tanh.c rename to src/utility/math/tanh.c diff --git a/src/md5.cpp b/src/utility/md5.cpp similarity index 100% rename from src/md5.cpp rename to src/utility/md5.cpp diff --git a/src/md5.h b/src/utility/md5.h similarity index 100% rename from src/md5.h rename to src/utility/md5.h diff --git a/src/memarena.cpp b/src/utility/memarena.cpp similarity index 100% rename from src/memarena.cpp rename to src/utility/memarena.cpp diff --git a/src/memarena.h b/src/utility/memarena.h similarity index 100% rename from src/memarena.h rename to src/utility/memarena.h diff --git a/src/nodebuild.cpp b/src/utility/nodebuilder/nodebuild.cpp similarity index 100% rename from src/nodebuild.cpp rename to src/utility/nodebuilder/nodebuild.cpp diff --git a/src/nodebuild.h b/src/utility/nodebuilder/nodebuild.h similarity index 100% rename from src/nodebuild.h rename to src/utility/nodebuilder/nodebuild.h diff --git a/src/nodebuild_classify_nosse2.cpp b/src/utility/nodebuilder/nodebuild_classify_nosse2.cpp similarity index 100% rename from src/nodebuild_classify_nosse2.cpp rename to src/utility/nodebuilder/nodebuild_classify_nosse2.cpp diff --git a/src/nodebuild_events.cpp b/src/utility/nodebuilder/nodebuild_events.cpp similarity index 100% rename from src/nodebuild_events.cpp rename to src/utility/nodebuilder/nodebuild_events.cpp diff --git a/src/nodebuild_extract.cpp b/src/utility/nodebuilder/nodebuild_extract.cpp similarity index 100% rename from src/nodebuild_extract.cpp rename to src/utility/nodebuilder/nodebuild_extract.cpp diff --git a/src/nodebuild_gl.cpp b/src/utility/nodebuilder/nodebuild_gl.cpp similarity index 100% rename from src/nodebuild_gl.cpp rename to src/utility/nodebuilder/nodebuild_gl.cpp diff --git a/src/nodebuild_utility.cpp b/src/utility/nodebuilder/nodebuild_utility.cpp similarity index 100% rename from src/nodebuild_utility.cpp rename to src/utility/nodebuilder/nodebuild_utility.cpp diff --git a/src/parallel_for.h b/src/utility/parallel_for.h similarity index 100% rename from src/parallel_for.h rename to src/utility/parallel_for.h diff --git a/src/rapidjson/allocators.h b/src/utility/rapidjson/allocators.h similarity index 100% rename from src/rapidjson/allocators.h rename to src/utility/rapidjson/allocators.h diff --git a/src/rapidjson/document.h b/src/utility/rapidjson/document.h similarity index 100% rename from src/rapidjson/document.h rename to src/utility/rapidjson/document.h diff --git a/src/rapidjson/encodedstream.h b/src/utility/rapidjson/encodedstream.h similarity index 100% rename from src/rapidjson/encodedstream.h rename to src/utility/rapidjson/encodedstream.h diff --git a/src/rapidjson/encodings.h b/src/utility/rapidjson/encodings.h similarity index 100% rename from src/rapidjson/encodings.h rename to src/utility/rapidjson/encodings.h diff --git a/src/rapidjson/error/en.h b/src/utility/rapidjson/error/en.h similarity index 100% rename from src/rapidjson/error/en.h rename to src/utility/rapidjson/error/en.h diff --git a/src/rapidjson/error/error.h b/src/utility/rapidjson/error/error.h similarity index 100% rename from src/rapidjson/error/error.h rename to src/utility/rapidjson/error/error.h diff --git a/src/rapidjson/filereadstream.h b/src/utility/rapidjson/filereadstream.h similarity index 100% rename from src/rapidjson/filereadstream.h rename to src/utility/rapidjson/filereadstream.h diff --git a/src/rapidjson/filewritestream.h b/src/utility/rapidjson/filewritestream.h similarity index 100% rename from src/rapidjson/filewritestream.h rename to src/utility/rapidjson/filewritestream.h diff --git a/src/rapidjson/fwd.h b/src/utility/rapidjson/fwd.h similarity index 100% rename from src/rapidjson/fwd.h rename to src/utility/rapidjson/fwd.h diff --git a/src/rapidjson/internal/biginteger.h b/src/utility/rapidjson/internal/biginteger.h similarity index 100% rename from src/rapidjson/internal/biginteger.h rename to src/utility/rapidjson/internal/biginteger.h diff --git a/src/rapidjson/internal/diyfp.h b/src/utility/rapidjson/internal/diyfp.h similarity index 100% rename from src/rapidjson/internal/diyfp.h rename to src/utility/rapidjson/internal/diyfp.h diff --git a/src/rapidjson/internal/dtoa.h b/src/utility/rapidjson/internal/dtoa.h similarity index 100% rename from src/rapidjson/internal/dtoa.h rename to src/utility/rapidjson/internal/dtoa.h diff --git a/src/rapidjson/internal/ieee754.h b/src/utility/rapidjson/internal/ieee754.h similarity index 100% rename from src/rapidjson/internal/ieee754.h rename to src/utility/rapidjson/internal/ieee754.h diff --git a/src/rapidjson/internal/itoa.h b/src/utility/rapidjson/internal/itoa.h similarity index 100% rename from src/rapidjson/internal/itoa.h rename to src/utility/rapidjson/internal/itoa.h diff --git a/src/rapidjson/internal/meta.h b/src/utility/rapidjson/internal/meta.h similarity index 100% rename from src/rapidjson/internal/meta.h rename to src/utility/rapidjson/internal/meta.h diff --git a/src/rapidjson/internal/pow10.h b/src/utility/rapidjson/internal/pow10.h similarity index 100% rename from src/rapidjson/internal/pow10.h rename to src/utility/rapidjson/internal/pow10.h diff --git a/src/rapidjson/internal/regex.h b/src/utility/rapidjson/internal/regex.h similarity index 100% rename from src/rapidjson/internal/regex.h rename to src/utility/rapidjson/internal/regex.h diff --git a/src/rapidjson/internal/stack.h b/src/utility/rapidjson/internal/stack.h similarity index 100% rename from src/rapidjson/internal/stack.h rename to src/utility/rapidjson/internal/stack.h diff --git a/src/rapidjson/internal/strfunc.h b/src/utility/rapidjson/internal/strfunc.h similarity index 100% rename from src/rapidjson/internal/strfunc.h rename to src/utility/rapidjson/internal/strfunc.h diff --git a/src/rapidjson/internal/strtod.h b/src/utility/rapidjson/internal/strtod.h similarity index 100% rename from src/rapidjson/internal/strtod.h rename to src/utility/rapidjson/internal/strtod.h diff --git a/src/rapidjson/internal/swap.h b/src/utility/rapidjson/internal/swap.h similarity index 100% rename from src/rapidjson/internal/swap.h rename to src/utility/rapidjson/internal/swap.h diff --git a/src/rapidjson/istreamwrapper.h b/src/utility/rapidjson/istreamwrapper.h similarity index 100% rename from src/rapidjson/istreamwrapper.h rename to src/utility/rapidjson/istreamwrapper.h diff --git a/src/rapidjson/memorybuffer.h b/src/utility/rapidjson/memorybuffer.h similarity index 100% rename from src/rapidjson/memorybuffer.h rename to src/utility/rapidjson/memorybuffer.h diff --git a/src/rapidjson/memorystream.h b/src/utility/rapidjson/memorystream.h similarity index 100% rename from src/rapidjson/memorystream.h rename to src/utility/rapidjson/memorystream.h diff --git a/src/rapidjson/msinttypes/inttypes.h b/src/utility/rapidjson/msinttypes/inttypes.h similarity index 100% rename from src/rapidjson/msinttypes/inttypes.h rename to src/utility/rapidjson/msinttypes/inttypes.h diff --git a/src/rapidjson/msinttypes/stdint.h b/src/utility/rapidjson/msinttypes/stdint.h similarity index 100% rename from src/rapidjson/msinttypes/stdint.h rename to src/utility/rapidjson/msinttypes/stdint.h diff --git a/src/rapidjson/ostreamwrapper.h b/src/utility/rapidjson/ostreamwrapper.h similarity index 100% rename from src/rapidjson/ostreamwrapper.h rename to src/utility/rapidjson/ostreamwrapper.h diff --git a/src/rapidjson/pointer.h b/src/utility/rapidjson/pointer.h similarity index 100% rename from src/rapidjson/pointer.h rename to src/utility/rapidjson/pointer.h diff --git a/src/rapidjson/prettywriter.h b/src/utility/rapidjson/prettywriter.h similarity index 100% rename from src/rapidjson/prettywriter.h rename to src/utility/rapidjson/prettywriter.h diff --git a/src/rapidjson/rapidjson.h b/src/utility/rapidjson/rapidjson.h similarity index 100% rename from src/rapidjson/rapidjson.h rename to src/utility/rapidjson/rapidjson.h diff --git a/src/rapidjson/reader.h b/src/utility/rapidjson/reader.h similarity index 100% rename from src/rapidjson/reader.h rename to src/utility/rapidjson/reader.h diff --git a/src/rapidjson/schema.h b/src/utility/rapidjson/schema.h similarity index 100% rename from src/rapidjson/schema.h rename to src/utility/rapidjson/schema.h diff --git a/src/rapidjson/stream.h b/src/utility/rapidjson/stream.h similarity index 100% rename from src/rapidjson/stream.h rename to src/utility/rapidjson/stream.h diff --git a/src/rapidjson/stringbuffer.h b/src/utility/rapidjson/stringbuffer.h similarity index 100% rename from src/rapidjson/stringbuffer.h rename to src/utility/rapidjson/stringbuffer.h diff --git a/src/rapidjson/writer.h b/src/utility/rapidjson/writer.h similarity index 100% rename from src/rapidjson/writer.h rename to src/utility/rapidjson/writer.h diff --git a/src/sc_man.cpp b/src/utility/sc_man.cpp similarity index 100% rename from src/sc_man.cpp rename to src/utility/sc_man.cpp diff --git a/src/sc_man.h b/src/utility/sc_man.h similarity index 100% rename from src/sc_man.h rename to src/utility/sc_man.h diff --git a/src/sc_man_scanner.re b/src/utility/sc_man_scanner.re similarity index 100% rename from src/sc_man_scanner.re rename to src/utility/sc_man_scanner.re diff --git a/src/sc_man_tokens.h b/src/utility/sc_man_tokens.h similarity index 100% rename from src/sc_man_tokens.h rename to src/utility/sc_man_tokens.h diff --git a/src/sfmt/LICENSE.txt b/src/utility/sfmt/LICENSE.txt similarity index 100% rename from src/sfmt/LICENSE.txt rename to src/utility/sfmt/LICENSE.txt diff --git a/src/sfmt/SFMT-alti.h b/src/utility/sfmt/SFMT-alti.h similarity index 100% rename from src/sfmt/SFMT-alti.h rename to src/utility/sfmt/SFMT-alti.h diff --git a/src/sfmt/SFMT-params.h b/src/utility/sfmt/SFMT-params.h similarity index 100% rename from src/sfmt/SFMT-params.h rename to src/utility/sfmt/SFMT-params.h diff --git a/src/sfmt/SFMT-params11213.h b/src/utility/sfmt/SFMT-params11213.h similarity index 100% rename from src/sfmt/SFMT-params11213.h rename to src/utility/sfmt/SFMT-params11213.h diff --git a/src/sfmt/SFMT-params1279.h b/src/utility/sfmt/SFMT-params1279.h similarity index 100% rename from src/sfmt/SFMT-params1279.h rename to src/utility/sfmt/SFMT-params1279.h diff --git a/src/sfmt/SFMT-params132049.h b/src/utility/sfmt/SFMT-params132049.h similarity index 100% rename from src/sfmt/SFMT-params132049.h rename to src/utility/sfmt/SFMT-params132049.h diff --git a/src/sfmt/SFMT-params19937.h b/src/utility/sfmt/SFMT-params19937.h similarity index 100% rename from src/sfmt/SFMT-params19937.h rename to src/utility/sfmt/SFMT-params19937.h diff --git a/src/sfmt/SFMT-params216091.h b/src/utility/sfmt/SFMT-params216091.h similarity index 100% rename from src/sfmt/SFMT-params216091.h rename to src/utility/sfmt/SFMT-params216091.h diff --git a/src/sfmt/SFMT-params2281.h b/src/utility/sfmt/SFMT-params2281.h similarity index 100% rename from src/sfmt/SFMT-params2281.h rename to src/utility/sfmt/SFMT-params2281.h diff --git a/src/sfmt/SFMT-params4253.h b/src/utility/sfmt/SFMT-params4253.h similarity index 100% rename from src/sfmt/SFMT-params4253.h rename to src/utility/sfmt/SFMT-params4253.h diff --git a/src/sfmt/SFMT-params44497.h b/src/utility/sfmt/SFMT-params44497.h similarity index 100% rename from src/sfmt/SFMT-params44497.h rename to src/utility/sfmt/SFMT-params44497.h diff --git a/src/sfmt/SFMT-params607.h b/src/utility/sfmt/SFMT-params607.h similarity index 100% rename from src/sfmt/SFMT-params607.h rename to src/utility/sfmt/SFMT-params607.h diff --git a/src/sfmt/SFMT-params86243.h b/src/utility/sfmt/SFMT-params86243.h similarity index 100% rename from src/sfmt/SFMT-params86243.h rename to src/utility/sfmt/SFMT-params86243.h diff --git a/src/sfmt/SFMT-sse2.h b/src/utility/sfmt/SFMT-sse2.h similarity index 100% rename from src/sfmt/SFMT-sse2.h rename to src/utility/sfmt/SFMT-sse2.h diff --git a/src/sfmt/SFMT.cpp b/src/utility/sfmt/SFMT.cpp similarity index 100% rename from src/sfmt/SFMT.cpp rename to src/utility/sfmt/SFMT.cpp diff --git a/src/sfmt/SFMT.h b/src/utility/sfmt/SFMT.h similarity index 100% rename from src/sfmt/SFMT.h rename to src/utility/sfmt/SFMT.h diff --git a/src/strnatcmp.c b/src/utility/strnatcmp.c similarity index 100% rename from src/strnatcmp.c rename to src/utility/strnatcmp.c diff --git a/src/strnatcmp.h b/src/utility/strnatcmp.h similarity index 100% rename from src/strnatcmp.h rename to src/utility/strnatcmp.h diff --git a/src/xs_Float.h b/src/utility/xs_Float.h similarity index 100% rename from src/xs_Float.h rename to src/utility/xs_Float.h