diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp index 416d059735..c21fc12a05 100644 --- a/apps/opencs/editor.cpp +++ b/apps/opencs/editor.cpp @@ -21,7 +21,7 @@ #include #ifdef _WIN32 -#include +#include #endif #include diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index a78bd22d42..b0b49f3acd 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -14,7 +14,7 @@ #include #if defined(_WIN32) -#include +#include // makes __argc and __argv available on windows #include diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index dd680dc98d..b0169cc2c2 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -77,6 +77,9 @@ add_component_dir (settings categories/video categories/water categories/windows + gyroscopeaxis + hrtfmode + navmeshrendermode parser sanitizer sanitizerimpl @@ -90,8 +93,16 @@ add_component_dir (bsa bsa_file compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream ) +add_component_dir (bullethelpers + collisionobject + heightfield + operators + processtrianglecallback + transformboundingbox + ) + add_component_dir (vfs - manager archive bsaarchive filesystemarchive registerarchives + manager archive bsaarchive filesystemarchive pathutil registerarchives ) add_component_dir (resource @@ -107,11 +118,12 @@ add_component_dir (sceneutil clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt - screencapture depth color riggeometryosgaextension extradata unrefqueue lightcommon lightingmethod + screencapture depth color riggeometryosgaextension extradata unrefqueue lightcommon lightingmethod clearcolor + cullsafeboundsvisitor keyframe nodecallback textkeymap ) add_component_dir (nif - base controller data effect extra niffile nifkey nifstream niftypes node particle physics property record record_ptr texture + base controller data effect extra niffile nifkey nifstream niftypes node parent particle physics property record recordptr texture ) add_component_dir (nifosg @@ -123,11 +135,13 @@ add_component_dir (nifbullet ) add_component_dir (to_utf8 + tables_gen to_utf8 ) add_component_dir(esm attr common defs esmcommon records util luascripts format refid esmbridge esmterrain formid + fourcc stringrefid generatedrefid indexrefid @@ -135,7 +149,7 @@ add_component_dir(esm attr common defs esmcommon records util luascripts format esm3exteriorcellrefid ) -add_component_dir(fx pass technique lexer widgets stateupdater) +add_component_dir(fx pass technique lexer lexer_types parse_constants widgets stateupdater) add_component_dir(std140 ubo) @@ -149,10 +163,11 @@ add_component_dir (esm3 inventorystate containerstate npcstate creaturestate dialoguestate statstate npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings readerscache - infoorder timestamp + infoorder timestamp formatversion landrecorddata ) add_component_dir (esmterrain + gridsampling storage ) @@ -255,8 +270,13 @@ add_component_dir (esm4 ) add_component_dir (misc - constants utf8stream resourcehelpers rng messageformatparser weakcache thread - compression osguservalues color tuplemeta tuplehelpers + barrier budgetmeasurement color compression constants convert coordinateconverter endianness float16 frameratelimiter + guarded math mathutil messageformatparser notnullptr objectpool osguservalues progressreporter resourcehelpers rng + strongtypedef thread timeconvert timer tuplehelpers tuplemeta utf8stream weakcache windows + ) + +add_component_dir (misc/strings + algorithm conversion format lower ) add_component_dir (stereo @@ -264,7 +284,7 @@ add_component_dir (stereo ) add_component_dir (debug - debugging debuglog gldebug debugdraw + debugging debuglog gldebug debugdraw writeflags ) IF(NOT WIN32 AND NOT APPLE) @@ -274,6 +294,7 @@ ENDIF() add_component_dir (files linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager constrainedfilestream memorystream hash configfileparser openfile constrainedfilestreambuf conversion + istreamptr streamwithbuffer ) add_component_dir (compiler @@ -285,7 +306,7 @@ add_component_dir (compiler add_component_dir (interpreter context controlopcodes genericopcodes installopcodes interpreter localopcodes mathopcodes - miscopcodes opcodes runtime types defines + miscopcodes opcodes program runtime types defines ) add_component_dir (translation @@ -414,13 +435,22 @@ add_component_dir(loadinglistener reporter ) +add_component_dir(serialization + binaryreader + binarywriter + osgyaml + sizeaccumulator + ) + add_component_dir(sqlite3 db + request statement transaction ) add_component_dir(esmloader + lessbyid load esmdata ) diff --git a/components/crashcatcher/windows_crashcatcher.hpp b/components/crashcatcher/windows_crashcatcher.hpp index 385567545f..89678c9ada 100644 --- a/components/crashcatcher/windows_crashcatcher.hpp +++ b/components/crashcatcher/windows_crashcatcher.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include namespace Crash { diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp index dc76ce3456..10a9166384 100644 --- a/components/crashcatcher/windows_crashmonitor.cpp +++ b/components/crashcatcher/windows_crashmonitor.cpp @@ -1,7 +1,7 @@ #include "windows_crashmonitor.hpp" #include -#include +#include #include diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp index 3e6d3adb98..16e173169e 100644 --- a/components/crashcatcher/windows_crashmonitor.hpp +++ b/components/crashcatcher/windows_crashmonitor.hpp @@ -1,7 +1,7 @@ #ifndef WINDOWS_CRASHMONITOR_HPP #define WINDOWS_CRASHMONITOR_HPP -#include +#include #include #include diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windows_crashshm.hpp index b3ba38fb2a..b919757890 100644 --- a/components/crashcatcher/windows_crashshm.hpp +++ b/components/crashcatcher/windows_crashshm.hpp @@ -1,7 +1,7 @@ #ifndef WINDOWS_CRASHSHM_HPP #define WINDOWS_CRASHSHM_HPP -#include +#include namespace Crash { diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp index 0bec74ce73..3be977657a 100644 --- a/components/debug/debugging.cpp +++ b/components/debug/debugging.cpp @@ -16,7 +16,7 @@ #ifdef _WIN32 #include #include -#include +#include #include diff --git a/components/misc/thread.cpp b/components/misc/thread.cpp index 7ac17d46d2..cece5ccbea 100644 --- a/components/misc/thread.cpp +++ b/components/misc/thread.cpp @@ -26,7 +26,7 @@ namespace Misc #elif defined(WIN32) -#include +#include namespace Misc { diff --git a/components/windows.hpp b/components/misc/windows.hpp similarity index 100% rename from components/windows.hpp rename to components/misc/windows.hpp diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp index efcb233fc0..f5ef60478b 100644 --- a/components/platform/file.win32.cpp +++ b/components/platform/file.win32.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include