From 70403989b44e163209e37f7afd571e351458c1d4 Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Tue, 14 Jul 2026 17:27:16 -0600 Subject: [PATCH] refactor(WWAudio): Qualify audio and debug header includes --- .../WWVegas/WWAudio/AABTreeSoundCullClass.h | 2 +- .../Source/WWVegas/WWAudio/AudibleSound.cpp | 8 ++++---- .../Source/WWVegas/WWAudio/AudibleSound.h | 14 +++++++------- .../Source/WWVegas/WWAudio/AudioEvents.h | 4 ++-- .../Source/WWVegas/WWAudio/AudioSaveLoad.cpp | 12 ++++++------ .../Source/WWVegas/WWAudio/AudioSaveLoad.h | 6 +++--- .../Source/WWVegas/WWAudio/FilteredSound.cpp | 2 +- .../Source/WWVegas/WWAudio/LogicalListener.cpp | 2 +- .../Source/WWVegas/WWAudio/LogicalListener.h | 6 +++--- .../Source/WWVegas/WWAudio/LogicalSound.cpp | 2 +- .../Source/WWVegas/WWAudio/LogicalSound.h | 6 +++--- .../Source/WWVegas/WWAudio/PriorityVector.h | 2 +- .../Source/WWVegas/WWAudio/Sound3D.cpp | 4 ++-- .../Libraries/Source/WWVegas/WWAudio/Sound3D.h | 2 +- .../Source/WWVegas/WWAudio/SoundBuffer.cpp | 8 ++++---- .../Source/WWVegas/WWAudio/SoundBuffer.h | 2 +- .../Source/WWVegas/WWAudio/SoundChunkIDs.h | 4 ++-- .../Source/WWVegas/WWAudio/SoundCullObj.h | 8 ++++---- .../Source/WWVegas/WWAudio/SoundPseudo3D.cpp | 2 +- .../Source/WWVegas/WWAudio/SoundScene.cpp | 8 ++++---- .../Source/WWVegas/WWAudio/SoundScene.h | 8 ++++---- .../Source/WWVegas/WWAudio/SoundSceneObj.cpp | 6 +++--- .../Source/WWVegas/WWAudio/SoundSceneObj.h | 10 +++++----- .../Source/WWVegas/WWAudio/Threads.cpp | 2 +- .../Libraries/Source/WWVegas/WWAudio/Threads.h | 4 ++-- .../Source/WWVegas/WWAudio/WWAudio.cpp | 18 +++++++++--------- .../Libraries/Source/WWVegas/WWAudio/WWAudio.h | 6 +++--- .../Source/WWVegas/WWDebug/wwdebug.cpp | 2 +- .../Source/WWVegas/WWDebug/wwmemlog.cpp | 6 +++--- .../Source/WWVegas/WWDebug/wwprofile.cpp | 16 ++++++++-------- .../Source/WWVegas/WWDebug/wwprofile.h | 2 +- 31 files changed, 92 insertions(+), 92 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h index 5721e4a3c09..ebd6acc4feb 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h @@ -36,7 +36,7 @@ #pragma once -#include "aabtreecull.h" +#include "WWMath/aabtreecull.h" ///////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp index 7cb459dc77f..7e9bdc689d0 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp @@ -37,17 +37,17 @@ #include "AudibleSound.h" #include "WWAudio.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" #include "SoundBuffer.h" #include "Utils.h" #include "SoundScene.h" #include "FilteredSound.h" #include "Threads.h" #include "SoundChunkIDs.h" -#include "simpledefinitionfactory.h" -#include "persistfactory.h" +#include "WWSaveLoad/simpledefinitionfactory.h" +#include "WWSaveLoad/persistfactory.h" #include "LogicalSound.h" -#include "definitionclassids.h" +#include "WWSaveLoad/definitionclassids.h" #include "soundstreamhandle.h" #include "sound2dhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h index 2f501056a47..36205805613 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h @@ -41,14 +41,14 @@ #pragma warning (pop) //#include -#include "always.h" -#include "vector3.h" -#include "matrix3d.h" -#include "RAWFILE.h" +#include "WWLib/always.h" +#include "WWMath/vector3.h" +#include "WWMath/matrix3d.h" +#include "WWLib/RAWFILE.h" #include "SoundSceneObj.h" -#include "Vector.h" -#include "wwstring.h" -#include "definition.h" +#include "WWLib/Vector.h" +#include "WWLib/wwstring.h" +#include "WWSaveLoad/definition.h" ///////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h index 4f45017c96f..155076f5b71 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -36,8 +36,8 @@ #pragma once -#include "simplevec.h" -#include "bittype.h" +#include "WWLib/simplevec.h" +#include "WWLib/bittype.h" ///////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp index 77f666ea87c..e5d5375f109 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp @@ -34,15 +34,15 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "always.h" +#include "WWLib/always.h" #include "AudioSaveLoad.h" -#include "persist.h" -#include "persistfactory.h" -#include "definition.h" +#include "WWSaveLoad/persist.h" +#include "WWSaveLoad/persistfactory.h" +#include "WWSaveLoad/definition.h" #include "SoundChunkIDs.h" -#include "chunkio.h" +#include "WWLib/chunkio.h" #include "SoundScene.h" -#include "wwmemlog.h" +#include "WWDebug/wwmemlog.h" /////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h index 6bba83f32e9..04a8cc416f1 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h @@ -36,9 +36,9 @@ #pragma once -#include "saveloadsubsystem.h" -#include "Vector.h" -#include "bittype.h" +#include "WWSaveLoad/saveloadsubsystem.h" +#include "WWLib/Vector.h" +#include "WWLib/bittype.h" // Singleton instances diff --git a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp index 80516c5c0c0..912620df148 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp @@ -39,7 +39,7 @@ #include "WWAudio.h" #include "SoundScene.h" #include "SoundChunkIDs.h" -#include "persistfactory.h" +#include "WWSaveLoad/persistfactory.h" #include "soundhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp index b5b7910c667..eace51dfbb1 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp @@ -36,7 +36,7 @@ #include "WWAudio.h" #include "SoundScene.h" #include "SoundChunkIDs.h" -#include "persistfactory.h" +#include "WWSaveLoad/persistfactory.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h index 125d9330414..875b87a7020 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h @@ -33,9 +33,9 @@ #pragma once #include "SoundSceneObj.h" -#include "bittype.h" -#include "vector3.h" -#include "matrix3d.h" +#include "WWLib/bittype.h" +#include "WWMath/vector3.h" +#include "WWMath/matrix3d.h" ///////////////////////////////////////////////////////////////////////////////// // diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp index 7653b1d16d2..00894d97b17 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp @@ -34,7 +34,7 @@ #include "WWAudio.h" #include "SoundScene.h" #include "SoundChunkIDs.h" -#include "persistfactory.h" +#include "WWSaveLoad/persistfactory.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h index 7fba4283030..5eb7b013db3 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h @@ -33,9 +33,9 @@ #pragma once #include "SoundSceneObj.h" -#include "bittype.h" -#include "vector3.h" -#include "matrix3d.h" +#include "WWLib/bittype.h" +#include "WWMath/vector3.h" +#include "WWMath/matrix3d.h" ///////////////////////////////////////////////////////////////////////////////// // diff --git a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h index 0649522a9b1..22652449dbb 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h @@ -32,7 +32,7 @@ #pragma once -#include "Vector.h" +#include "WWLib/Vector.h" //////////////////////////////////////////////////////////////////// // diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp index 63ccd2b70f1..20e019930c4 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp @@ -41,8 +41,8 @@ #include "SoundScene.h" #include "Utils.h" #include "SoundChunkIDs.h" -#include "persistfactory.h" -#include "chunkio.h" +#include "WWSaveLoad/persistfactory.h" +#include "WWLib/chunkio.h" #include "sound3dhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h index d8b53c5cc5b..1891c2e8570 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h @@ -37,7 +37,7 @@ #pragma once #include "AudibleSound.h" -#include "mempool.h" +#include "WWLib/mempool.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp index cf647adde73..15471a46fb7 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp @@ -36,11 +36,11 @@ #include "SoundBuffer.h" -#include "RAWFILE.h" -#include "wwdebug.h" +#include "WWLib/RAWFILE.h" +#include "WWDebug/wwdebug.h" #include "Utils.h" -#include "ffactory.h" -#include "win.h" +#include "WWLib/ffactory.h" +#include "WWLib/win.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h index 867f3777b96..8889b2eeaca 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h @@ -40,7 +40,7 @@ #include "mss.h" #pragma warning (pop) -#include "always.h" +#include "WWLib/always.h" // Forward declarations diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h index 1d215304146..5437f2f1135 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h @@ -36,8 +36,8 @@ #pragma once -#include "saveloadids.h" -#include "definitionclassids.h" +#include "WWSaveLoad/saveloadids.h" +#include "WWSaveLoad/definitionclassids.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h index de3d5647b24..0ae12db85bf 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h @@ -36,11 +36,11 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "SoundSceneObj.h" -#include "cullsys.h" -#include "mempool.h" -#include "multilist.h" +#include "WWMath/cullsys.h" +#include "WWLib/mempool.h" +#include "WWLib/multilist.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp index 8de1e8ffda4..3805659b907 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp @@ -40,7 +40,7 @@ #include "SoundScene.h" #include "Utils.h" #include "SoundChunkIDs.h" -#include "persistfactory.h" +#include "WWSaveLoad/persistfactory.h" #include "soundhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp index ba241fdfd5f..4427f3d7bff 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp @@ -39,11 +39,11 @@ #include "SoundCullObj.h" #include "LogicalSound.h" #include "LogicalListener.h" -#include "chunkio.h" -#include "persistfactory.h" -#include "wwprofile.h" +#include "WWLib/chunkio.h" +#include "WWSaveLoad/persistfactory.h" +#include "WWDebug/wwprofile.h" #include "Threads.h" -#include "wwmemlog.h" +#include "WWDebug/wwmemlog.h" DEFINE_AUTO_POOL(SoundSceneClass::AudibleInfoClass, 64); diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h index 495ca31fd29..d25a5a87069 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h @@ -36,14 +36,14 @@ #pragma once -#include "aabtreecull.h" -#include "gridcull.h" +#include "WWMath/aabtreecull.h" +#include "WWMath/gridcull.h" #include "Listener.h" -#include "Vector.h" +#include "WWLib/Vector.h" #include "PriorityVector.h" #include "SoundCullObj.h" #include "LogicalListener.h" -#include "multilist.h" +#include "WWLib/multilist.h" // Forward declarations class RenderObjClass; diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp index 59b0ecde88b..7a0bd0ad12a 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp @@ -34,9 +34,9 @@ #include "SoundSceneObj.h" -#include "camera.h" -#include "rendobj.h" -#include "persistfactory.h" +#include "WW3D2/camera.h" +#include "WW3D2/rendobj.h" +#include "WWSaveLoad/persistfactory.h" #include "SoundChunkIDs.h" #include "Utils.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h index 3f85a5566fb..a5d6f7d0b0a 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h @@ -34,12 +34,12 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "WWAudio.h" -#include "bittype.h" -#include "persist.h" -#include "multilist.h" -#include "mutex.h" +#include "WWLib/bittype.h" +#include "WWSaveLoad/persist.h" +#include "WWLib/multilist.h" +#include "WWLib/mutex.h" ///////////////////////////////////////////////////////////////////////////////// // Forward declarations diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp b/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp index 26be223af22..97a061a3e31 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp @@ -30,7 +30,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "always.h" +#include "WWLib/always.h" #include "Threads.h" #include "Utils.h" #include diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h index e1d79fead10..b277c14fd30 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h @@ -33,8 +33,8 @@ #pragma once #include "windows.h" -#include "Vector.h" -#include "mutex.h" +#include "WWLib/Vector.h" +#include "WWLib/mutex.h" // Forward declarations class RefCountClass; diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp index 0c3744342c7..5deef46192c 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp +++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp @@ -35,26 +35,26 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "always.h" +#include "WWLib/always.h" #include #include "WWAudio.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" #include "Utils.h" -#include "realcrc.h" +#include "WWLib/realcrc.h" #include "SoundBuffer.h" #include "AudibleSound.h" #include "Sound3D.h" -#include "RAWFILE.h" +#include "WWLib/RAWFILE.h" #include "SoundScene.h" #include "SoundPseudo3D.h" -#include "ffactory.h" -#include "registry.h" +#include "WWLib/ffactory.h" +#include "WWLib/registry.h" #include "Threads.h" #include "LogicalSound.h" #include "LogicalListener.h" -#include "definitionclassids.h" -#include "wwmemlog.h" -#include "wwprofile.h" +#include "WWSaveLoad/definitionclassids.h" +#include "WWDebug/wwmemlog.h" +#include "WWDebug/wwprofile.h" #ifdef G_CODE_BASE diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h index e79a3ea9375..52f544f5d65 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h @@ -36,15 +36,15 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) -#include "Vector.h" +#include "WWLib/Vector.h" #include "SoundBuffer.h" #include "AudioEvents.h" -#include "wwstring.h" +#include "WWLib/wwstring.h" ///////////////////////////////////////////////////////////////////////////////// // Forward declaration diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp index aa1ce5d13b6..a2d59f6e482 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp @@ -49,7 +49,7 @@ #include #include #include -#include "Except.h" +#include "WWLib/Except.h" #ifdef _WIN32 #include diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp index c5ac68b7647..81f13b97e38 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp @@ -38,11 +38,11 @@ * WWMemoryLogClass::Release_Memory -- frees memory * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "always.h" +#include "WWLib/always.h" #include "wwmemlog.h" #include "wwdebug.h" -#include "Vector.h" -#include "FastAllocator.h" +#include "WWLib/Vector.h" +#include "WWLib/FastAllocator.h" #define USE_FAST_ALLOCATOR diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp index 4eb788fae80..5982f0b8cbd 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp @@ -49,17 +49,17 @@ * WWProfileManager::Release_In_Order_Iterator -- Return an "in-order" iterator * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "always.h" +#include "WWLib/always.h" #include "wwprofile.h" -#include "FastAllocator.h" +#include "WWLib/FastAllocator.h" #include "wwdebug.h" //#include "systimer.h" -#include "systimer.h" -#include "RAWFILE.h" -#include "ffactory.h" -#include "simplevec.h" -#include "cpudetect.h" -#include "hashtemplate.h" +#include "WWLib/systimer.h" +#include "WWLib/RAWFILE.h" +#include "WWLib/ffactory.h" +#include "WWLib/simplevec.h" +#include "WWLib/cpudetect.h" +#include "WWLib/hashtemplate.h" #include static SimpleDynVecClass ProfileCollectVector; diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h index 9c2fad93226..44aea85c0ce 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h @@ -37,7 +37,7 @@ #pragma once //#define ENABLE_TIME_AND_MEMORY_LOG -#include "wwstring.h" +#include "WWLib/wwstring.h" #ifdef _UNIX typedef signed long long __int64;