Index: source/graphics/Color.cpp =================================================================== --- source/graphics/Color.cpp +++ source/graphics/Color.cpp @@ -20,8 +20,8 @@ #include "graphics/Color.h" #include "graphics/SColor.h" +#include "lib/sysdep/arch/x86_x64/sse.h" #include "maths/MathUtil.h" -#include "lib/sse.h" #include "ps/CLogger.h" #include "ps/CStr.h" Index: source/graphics/ModelDef.cpp =================================================================== --- source/graphics/ModelDef.cpp +++ source/graphics/ModelDef.cpp @@ -23,7 +23,7 @@ #include "ModelDef.h" #include "graphics/SkeletonAnimDef.h" -#include "lib/sse.h" +#include "lib/sysdep/arch/x86_x64/sse.h" #include "ps/FileIo.h" #include "maths/Vector4D.h" Index: source/lib/sse.h =================================================================== --- source/lib/sse.h +++ source/lib/sse.h @@ -1,32 +0,0 @@ -/* Copyright (C) 2020 Wildfire Games. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef INCLUDED_SSE -#define INCLUDED_SSE - -#include "lib/sysdep/compiler.h" - -#if COMPILER_HAS_SSE -extern bool HostHasSSE(); -#endif - -#endif // INCLUDED_SSE Index: source/lib/sse.cpp =================================================================== --- source/lib/sse.cpp +++ source/lib/sse.cpp @@ -1,46 +0,0 @@ -/* Copyright (C) 2020 Wildfire Games. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "precompiled.h" - -#include "lib/sse.h" - -#if COMPILER_HAS_SSE -#include "lib/code_generation.h" -#include "lib/debug.h" -#include "lib/sysdep/arch.h" - -#if ARCH_X86_X64 -#include "lib/sysdep/arch/x86_x64/x86_x64.h" -#endif - -bool HostHasSSE() -{ -#if ARCH_X86_X64 - return x86_x64::Cap(x86_x64::CAP_SSE); -#elif ARCH_E2K - return true; -#else - return false; -#endif -} -#endif Index: source/lib/sysdep/arch/x86_x64/sse.cpp =================================================================== --- source/lib/sysdep/arch/x86_x64/sse.cpp +++ source/lib/sysdep/arch/x86_x64/sse.cpp @@ -22,7 +22,7 @@ #include "precompiled.h" -#include "lib/sse.h" +#include "lib/sysdep/arch/x86_x64/sse.h" #if COMPILER_HAS_SSE #include "lib/code_generation.h"