diff --git a/CommonLibSF/.clang-format b/.clang-format similarity index 100% rename from CommonLibSF/.clang-format rename to .clang-format diff --git a/CommonLibSF/.editorconfig b/.editorconfig similarity index 100% rename from CommonLibSF/.editorconfig rename to .editorconfig diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 049f1bb2..c52e8aac 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -4,8 +4,11 @@ on: pull_request: branches: [main, feature/*, fix/*, maintenance] paths: - - "CommonLibSF/**" + - "src/**" + - "include/**" - ".github/workflows/main_ci.yml" + - "CMakeLists.txt" + - "CMakePresets.json" workflow_dispatch: jobs: diff --git a/.github/workflows/main_ci_xmake.yml b/.github/workflows/main_ci_xmake.yml index 14c23aa4..2e616310 100644 --- a/.github/workflows/main_ci_xmake.yml +++ b/.github/workflows/main_ci_xmake.yml @@ -4,7 +4,9 @@ on: pull_request: branches: [main, feature/*, fix/*] paths: - - "CommonLibSF/**" + - "src/**" + - "include/**" + - ".github/workflows/**" - "xmake.lua" workflow_dispatch: diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml index e694f00f..e7cbce43 100644 --- a/.github/workflows/maintenance.yml +++ b/.github/workflows/maintenance.yml @@ -4,7 +4,9 @@ on: push: branches: main paths: - - "CommonLibSF/**" + - "src/**" + - "include/**" + - ".github/workflows/**" workflow_dispatch: concurrency: @@ -21,7 +23,7 @@ jobs: - name: Update Starfield.h shell: pwsh - run: "& ${{ github.workspace }}/.github/make-directives.ps1 ${{ github.workspace }}/CommonLibSF" + run: "& ${{ github.workspace }}/.github/make-directives.ps1 ${{ github.workspace }}" - name: Run clang-format uses: DoozyX/clang-format-lint-action@v0.17 diff --git a/CMakeLists.txt b/CMakeLists.txt index 10c974bc..0c432e22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,19 +1,185 @@ cmake_minimum_required(VERSION 3.26) +message("Using toolchain file ${CMAKE_TOOLCHAIN_FILE}.") # singleton target across multiple projects -if(TARGET CommonLib) +if(TARGET CommonLibSF) return() endif() +# options if not defined +option(SFSE_SUPPORT_XBYAK "Enables trampoline support for Xbyak." OFF) +option(SFSE_BUILD_TESTS "Builds the tests." OFF) + # info project( - CommonLib + CommonLibSF LANGUAGES CXX ) +# standards & flags +set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) +set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF) +set(CMAKE_OPTIMIZE_DEPENDENCIES ON) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +include(GNUInstallDirs) + # out-of-source builds only if(${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR}) message(FATAL_ERROR "In-source builds are not allowed.") endif() -add_subdirectory(CommonLibSF) +# dependencies +find_package(spdlog CONFIG REQUIRED) + +# source files +execute_process( + COMMAND powershell -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_SOURCE_DIR}/cmake/make-sourcelist.ps1" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" +) + +include(${CMAKE_CURRENT_BINARY_DIR}/sourcelist.cmake) + +source_group( + TREE ${CMAKE_CURRENT_SOURCE_DIR} + FILES ${SOURCES} +) + +function(configure_target TARGET_NAME) + target_compile_definitions( + ${TARGET_NAME} + PUBLIC + WINVER=0x0A00 # windows 10, minimum supported version by starfield + _WIN32_WINNT=0x0A00 + "$<$:SFSE_SUPPORT_XBYAK=1>" + ) + + # FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/24922 + set_property( + TARGET ${TARGET_NAME} + PROPERTY VS_USER_PROPS + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/build_stl_modules.props" + ) + + if(MSVC) + target_compile_options( + ${TARGET_NAME} + PUBLIC + /bigobj # support large object file format + /utf-8 # assume UTF-8 sources even without a BOM + + # warnings -> errors + /we4715 # 'function' : not all control paths return a value + + # disable warnings + /wd4005 # macro redefinition + /wd4061 # enumerator 'identifier' in switch of enum 'enumeration' is not explicitly handled by a case label + /wd4068 # unknown pragma + /wd4200 # nonstandard extension used : zero-sized array in struct/union + /wd4201 # nonstandard extension used : nameless struct/union + /wd4265 # 'type': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly + /wd4266 # 'function' : no override available for virtual member function from base 'type'; function is hidden + /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data + /wd4371 # 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member' + /wd4514 # 'function' : unreferenced inline function has been removed + /wd4582 # 'type': constructor is not implicitly called + /wd4583 # 'type': destructor is not implicitly called + /wd4623 # 'derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted + /wd4625 # 'derived class' : copy constructor was implicitly defined as deleted because a base class copy constructor is inaccessible or deleted + /wd4626 # 'derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted + /wd4710 # 'function' : function not inlined + /wd4711 # function 'function' selected for inline expansion + /wd4820 # 'bytes' bytes padding added after construct 'member_name' + /wd4996 + /wd5026 # 'type': move constructor was implicitly defined as deleted + /wd5027 # 'type': move assignment operator was implicitly defined as deleted + /wd5045 # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified + /wd5053 # support for 'explicit()' in C++17 and earlier is a vendor extension + /wd5204 # 'type-name': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly + /wd5220 # 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial + ) + endif() + + target_include_directories( + ${TARGET_NAME} + PUBLIC + "$" + "$" + ) + + target_link_libraries( + ${TARGET_NAME} + PUBLIC + spdlog::spdlog + Version.lib + Dbghelp.lib + Ws2_32.lib + ) + + if(SFSE_SUPPORT_XBYAK) + find_package(xbyak CONFIG REQUIRED) + endif() + + target_precompile_headers( + ${TARGET_NAME} + PRIVATE + include/SFSE/Impl/PCH.h + ) +endfunction() + +if(SFSE_BUILD_TESTS) + # add a custom library target that just builds test.cpp + add_library( + ${PROJECT_NAME}-test + STATIC + ${SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp + ) + configure_target(${PROJECT_NAME}-test) + set(PROJECT_NAME ${PROJECT_NAME}-test) +else() + add_library( + ${PROJECT_NAME} + STATIC + ${SOURCES} + ) + add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + configure_target(${PROJECT_NAME}) +endif() + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}-targets +) + +install( + EXPORT ${PROJECT_NAME}-targets + NAMESPACE ${PROJECT_NAME}:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} +) + +configure_file( + cmake/config.cmake.in + ${PROJECT_NAME}Config.cmake + @ONLY +) + +install( + FILES cmake/CommonLibSF.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} +) + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} +) + +install( + DIRECTORY + include/RE + include/REL + include/SFSE + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) diff --git a/CommonLibSF/CMakePresets.json b/CMakePresets.json similarity index 98% rename from CommonLibSF/CMakePresets.json rename to CMakePresets.json index d6c6178d..1fbc6005 100644 --- a/CommonLibSF/CMakePresets.json +++ b/CMakePresets.json @@ -96,7 +96,7 @@ "CMAKE_CXX_COMPILER": "clang-cl" }, "environment": { - "PROJECT_COMPILER_FLAGS": "/D_ITERATOR_DEBUG_LEVEL=0 /cgthreads8 /diagnostics:caret /EHsc /fp:contract /fp:except- /guard:cf- /permissive- /Zc:__cplusplus /Zc:rvalueCast /Zc:ternary /external:W0 -Wno-overloaded-virtual -Wno-delete-non-abstract-non-virtual-dtor -Wno-inconsistent-missing-override -Wno-reinterpret-base-class -Wno-return-type" + "PROJECT_COMPILER_FLAGS": "/D_ITERATOR_DEBUG_LEVEL=0 /cgthreads8 /diagnostics:caret /EHsc /fp:contract /fp:except- /guard:cf- /permissive- /Zc:__cplusplus /Zc:rvalueCast /Zc:ternary /external:W0 -Wno-overloaded-virtual -Wno-delete-non-abstract-non-virtual-dtor -Wno-inconsistent-missing-override -Wno-reinterpret-base-class -Wno-return-type -Wno-invalid-offsetof -Wno-switch" }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { diff --git a/CommonLibSF/CMakeLists.txt b/CommonLibSF/CMakeLists.txt deleted file mode 100644 index 0c432e22..00000000 --- a/CommonLibSF/CMakeLists.txt +++ /dev/null @@ -1,185 +0,0 @@ -cmake_minimum_required(VERSION 3.26) -message("Using toolchain file ${CMAKE_TOOLCHAIN_FILE}.") - -# singleton target across multiple projects -if(TARGET CommonLibSF) - return() -endif() - -# options if not defined -option(SFSE_SUPPORT_XBYAK "Enables trampoline support for Xbyak." OFF) -option(SFSE_BUILD_TESTS "Builds the tests." OFF) - -# info -project( - CommonLibSF - LANGUAGES CXX -) - -# standards & flags -set(CMAKE_CXX_STANDARD 23) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) -set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF) -set(CMAKE_OPTIMIZE_DEPENDENCIES ON) - -set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -include(GNUInstallDirs) - -# out-of-source builds only -if(${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR}) - message(FATAL_ERROR "In-source builds are not allowed.") -endif() - -# dependencies -find_package(spdlog CONFIG REQUIRED) - -# source files -execute_process( - COMMAND powershell -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_SOURCE_DIR}/cmake/make-sourcelist.ps1" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" -) - -include(${CMAKE_CURRENT_BINARY_DIR}/sourcelist.cmake) - -source_group( - TREE ${CMAKE_CURRENT_SOURCE_DIR} - FILES ${SOURCES} -) - -function(configure_target TARGET_NAME) - target_compile_definitions( - ${TARGET_NAME} - PUBLIC - WINVER=0x0A00 # windows 10, minimum supported version by starfield - _WIN32_WINNT=0x0A00 - "$<$:SFSE_SUPPORT_XBYAK=1>" - ) - - # FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/24922 - set_property( - TARGET ${TARGET_NAME} - PROPERTY VS_USER_PROPS - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/build_stl_modules.props" - ) - - if(MSVC) - target_compile_options( - ${TARGET_NAME} - PUBLIC - /bigobj # support large object file format - /utf-8 # assume UTF-8 sources even without a BOM - - # warnings -> errors - /we4715 # 'function' : not all control paths return a value - - # disable warnings - /wd4005 # macro redefinition - /wd4061 # enumerator 'identifier' in switch of enum 'enumeration' is not explicitly handled by a case label - /wd4068 # unknown pragma - /wd4200 # nonstandard extension used : zero-sized array in struct/union - /wd4201 # nonstandard extension used : nameless struct/union - /wd4265 # 'type': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly - /wd4266 # 'function' : no override available for virtual member function from base 'type'; function is hidden - /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data - /wd4371 # 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member' - /wd4514 # 'function' : unreferenced inline function has been removed - /wd4582 # 'type': constructor is not implicitly called - /wd4583 # 'type': destructor is not implicitly called - /wd4623 # 'derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted - /wd4625 # 'derived class' : copy constructor was implicitly defined as deleted because a base class copy constructor is inaccessible or deleted - /wd4626 # 'derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted - /wd4710 # 'function' : function not inlined - /wd4711 # function 'function' selected for inline expansion - /wd4820 # 'bytes' bytes padding added after construct 'member_name' - /wd4996 - /wd5026 # 'type': move constructor was implicitly defined as deleted - /wd5027 # 'type': move assignment operator was implicitly defined as deleted - /wd5045 # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified - /wd5053 # support for 'explicit()' in C++17 and earlier is a vendor extension - /wd5204 # 'type-name': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly - /wd5220 # 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial - ) - endif() - - target_include_directories( - ${TARGET_NAME} - PUBLIC - "$" - "$" - ) - - target_link_libraries( - ${TARGET_NAME} - PUBLIC - spdlog::spdlog - Version.lib - Dbghelp.lib - Ws2_32.lib - ) - - if(SFSE_SUPPORT_XBYAK) - find_package(xbyak CONFIG REQUIRED) - endif() - - target_precompile_headers( - ${TARGET_NAME} - PRIVATE - include/SFSE/Impl/PCH.h - ) -endfunction() - -if(SFSE_BUILD_TESTS) - # add a custom library target that just builds test.cpp - add_library( - ${PROJECT_NAME}-test - STATIC - ${SOURCES} - ${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp - ) - configure_target(${PROJECT_NAME}-test) - set(PROJECT_NAME ${PROJECT_NAME}-test) -else() - add_library( - ${PROJECT_NAME} - STATIC - ${SOURCES} - ) - add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) - configure_target(${PROJECT_NAME}) -endif() - -install( - TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}-targets -) - -install( - EXPORT ${PROJECT_NAME}-targets - NAMESPACE ${PROJECT_NAME}:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -) - -configure_file( - cmake/config.cmake.in - ${PROJECT_NAME}Config.cmake - @ONLY -) - -install( - FILES cmake/CommonLibSF.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -) - -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -) - -install( - DIRECTORY - include/RE - include/REL - include/SFSE - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) diff --git a/CommonLibSF/xmake.lua b/CommonLibSF/xmake.lua deleted file mode 100644 index ab9cf09f..00000000 --- a/CommonLibSF/xmake.lua +++ /dev/null @@ -1,101 +0,0 @@ --- make extras available -includes("xmake-extra.lua") - --- define options -option("sfse_xbyak", function() - set_default(false) - set_description("Enable trampoline support for Xbyak") - add_defines("SFSE_SUPPORT_XBYAK=1") -end) - --- define targets -target("commonlibsf") - -- set target kind - set_kind("static") - - -- add packages - add_packages("spdlog", { public = true }) - - if has_config("sfse_xbyak") then - add_packages("xbyak") - end - - -- add options - add_options("sfse_xbyak") - - -- add system links - add_syslinks("advapi32", "dbghelp", "ole32", "shell32", "user32", "version", "Ws2_32") - - -- add source files - add_files("src/**.cpp") - - -- add header files - add_includedirs("include", { public = true }) - add_headerfiles( - "include/(RE/**.h)", - "include/(REL/**.h)", - "include/(SFSE/**.h)" - ) - - -- set precompiled header - set_pcxxheader("include/SFSE/Impl/PCH.h") - - -- add flags - add_cxxflags("/permissive-") - - -- add flags (cl) - add_cxxflags( - "cl::/bigobj", - "cl::/cgthreads8", - "cl::/diagnostics:caret", - "cl::/external:W0", - "cl::/fp:contract", - "cl::/fp:except-", - "cl::/guard:cf-", - "cl::/Zc:enumTypes", - "cl::/Zc:preprocessor", - "cl::/Zc:templateScope" - ) - - -- add flags (cl: warnings -> errors) - add_cxxflags("cl::/we4715") -- `function` : not all control paths return a value - - -- add flags (cl: disable warnings) - add_cxxflags( - "cl::/wd4005", -- macro redefinition - "cl::/wd4061", -- enumerator `identifier` in switch of enum `enumeration` is not explicitly handled by a case label - "cl::/wd4068", -- unknown pragma 'clang' - "cl::/wd4200", -- nonstandard extension used : zero-sized array in struct/union - "cl::/wd4201", -- nonstandard extension used : nameless struct/union - "cl::/wd4264", -- 'virtual_function' : no override available for virtual member function from base 'class'; function is hidden - "cl::/wd4265", -- 'type': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly - "cl::/wd4266", -- 'function' : no override available for virtual member function from base 'type'; function is hidden - "cl::/wd4324", -- 'struct_name' : structure was padded due to __declspec(align()) - "cl::/wd4371", -- 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member' - "cl::/wd4514", -- 'function' : unreferenced inline function has been removed - "cl::/wd4582", -- 'type': constructor is not implicitly called - "cl::/wd4583", -- 'type': destructor is not implicitly called - "cl::/wd4623", -- 'derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted - "cl::/wd4625", -- 'derived class' : copy constructor was implicitly defined as deleted because a base class copy constructor is inaccessible or deleted - "cl::/wd4626", -- 'derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted - "cl::/wd4686", -- 'user-defined type' : possible change in behavior, change in UDT return calling convention - "cl::/wd4710", -- 'function' : function not inlined - "cl::/wd4711", -- function 'function' selected for inline expansion - "cl::/wd4820", -- 'bytes' bytes padding added after construct 'member_name' - "cl::/wd5082", -- second argument to 'va_start' is not the last named parameter - "cl::/wd5026", -- 'type': move constructor was implicitly defined as deleted - "cl::/wd5027", -- 'type': move assignment operator was implicitly defined as deleted - "cl::/wd5045", -- compiler will insert Spectre mitigation for memory load if /Qspectre switch specified - "cl::/wd5053", -- support for 'explicit()' in C++17 and earlier is a vendor extension - "cl::/wd5105", -- macro expansion producing 'defined' has undefined behavior (workaround for older msvc bug) - "cl::/wd5204", -- 'type-name': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly - "cl::/wd5220" -- 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial - ) - - -- add flags (clang-cl: disable warnings) - add_cxxflags( - "clang_cl::-Wno-delete-non-abstract-non-virtual-dtor", - "clang_cl::-Wno-inconsistent-missing-override", - "clang_cl::-Wno-overloaded-virtual", - "clang_cl::-Wno-reinterpret-base-class" - ) diff --git a/CommonLibSF/LICENSES/COMMONLIB b/LICENSES/COMMONLIB similarity index 100% rename from CommonLibSF/LICENSES/COMMONLIB rename to LICENSES/COMMONLIB diff --git a/CommonLibSF/cmake/CommonLibSF.cmake b/cmake/CommonLibSF.cmake similarity index 100% rename from CommonLibSF/cmake/CommonLibSF.cmake rename to cmake/CommonLibSF.cmake diff --git a/CommonLibSF/cmake/build_stl_modules.props b/cmake/build_stl_modules.props similarity index 100% rename from CommonLibSF/cmake/build_stl_modules.props rename to cmake/build_stl_modules.props diff --git a/CommonLibSF/cmake/config.cmake.in b/cmake/config.cmake.in similarity index 100% rename from CommonLibSF/cmake/config.cmake.in rename to cmake/config.cmake.in diff --git a/CommonLibSF/cmake/make-sourcelist.ps1 b/cmake/make-sourcelist.ps1 similarity index 100% rename from CommonLibSF/cmake/make-sourcelist.ps1 rename to cmake/make-sourcelist.ps1 diff --git a/CommonLibSF/include/RE/A/AIProcess.h b/include/RE/A/AIProcess.h similarity index 100% rename from CommonLibSF/include/RE/A/AIProcess.h rename to include/RE/A/AIProcess.h diff --git a/CommonLibSF/include/RE/A/AVMData.h b/include/RE/A/AVMData.h similarity index 100% rename from CommonLibSF/include/RE/A/AVMData.h rename to include/RE/A/AVMData.h diff --git a/CommonLibSF/include/RE/A/Actor.h b/include/RE/A/Actor.h similarity index 100% rename from CommonLibSF/include/RE/A/Actor.h rename to include/RE/A/Actor.h diff --git a/CommonLibSF/include/RE/A/ActorEquipManager.h b/include/RE/A/ActorEquipManager.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorEquipManager.h rename to include/RE/A/ActorEquipManager.h diff --git a/CommonLibSF/include/RE/A/ActorPackage.h b/include/RE/A/ActorPackage.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorPackage.h rename to include/RE/A/ActorPackage.h diff --git a/CommonLibSF/include/RE/A/ActorState.h b/include/RE/A/ActorState.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorState.h rename to include/RE/A/ActorState.h diff --git a/CommonLibSF/include/RE/A/ActorValueInfo.h b/include/RE/A/ActorValueInfo.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorValueInfo.h rename to include/RE/A/ActorValueInfo.h diff --git a/CommonLibSF/include/RE/A/ActorValueOwner.h b/include/RE/A/ActorValueOwner.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorValueOwner.h rename to include/RE/A/ActorValueOwner.h diff --git a/CommonLibSF/include/RE/A/ActorValueStorage.h b/include/RE/A/ActorValueStorage.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorValueStorage.h rename to include/RE/A/ActorValueStorage.h diff --git a/CommonLibSF/include/RE/A/ActorValues.h b/include/RE/A/ActorValues.h similarity index 100% rename from CommonLibSF/include/RE/A/ActorValues.h rename to include/RE/A/ActorValues.h diff --git a/CommonLibSF/include/RE/A/AlchemyItem.h b/include/RE/A/AlchemyItem.h similarity index 100% rename from CommonLibSF/include/RE/A/AlchemyItem.h rename to include/RE/A/AlchemyItem.h diff --git a/CommonLibSF/include/RE/A/Array.h b/include/RE/A/Array.h similarity index 100% rename from CommonLibSF/include/RE/A/Array.h rename to include/RE/A/Array.h diff --git a/CommonLibSF/include/RE/A/ArrowProjectile.h b/include/RE/A/ArrowProjectile.h similarity index 100% rename from CommonLibSF/include/RE/A/ArrowProjectile.h rename to include/RE/A/ArrowProjectile.h diff --git a/CommonLibSF/include/RE/B/BGSAcousticSpace.h b/include/RE/B/BGSAcousticSpace.h similarity index 96% rename from CommonLibSF/include/RE/B/BGSAcousticSpace.h rename to include/RE/B/BGSAcousticSpace.h index c6a45ebc..77bd3b63 100644 --- a/CommonLibSF/include/RE/B/BGSAcousticSpace.h +++ b/include/RE/B/BGSAcousticSpace.h @@ -2,7 +2,7 @@ #include "RE/B/BSTArray.h" #include "RE/T/TESBoundObject.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/B/BGSAction.h b/include/RE/B/BGSAction.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAction.h rename to include/RE/B/BGSAction.h diff --git a/CommonLibSF/include/RE/B/BGSAddonNode.h b/include/RE/B/BGSAddonNode.h similarity index 96% rename from CommonLibSF/include/RE/B/BGSAddonNode.h rename to include/RE/B/BGSAddonNode.h index 65850f33..be27a53f 100644 --- a/CommonLibSF/include/RE/B/BGSAddonNode.h +++ b/include/RE/B/BGSAddonNode.h @@ -2,7 +2,7 @@ #include "RE/B/BGSModelMaterialSwap.h" #include "RE/T/TESBoundObject.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/B/BGSAffinityEvent.h b/include/RE/B/BGSAffinityEvent.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAffinityEvent.h rename to include/RE/B/BGSAffinityEvent.h diff --git a/CommonLibSF/include/RE/B/BGSAimAssistModel.h b/include/RE/B/BGSAimAssistModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAimAssistModel.h rename to include/RE/B/BGSAimAssistModel.h diff --git a/CommonLibSF/include/RE/B/BGSAimAssistPoseData.h b/include/RE/B/BGSAimAssistPoseData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAimAssistPoseData.h rename to include/RE/B/BGSAimAssistPoseData.h diff --git a/CommonLibSF/include/RE/B/BGSAimDownSightModel.h b/include/RE/B/BGSAimDownSightModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAimDownSightModel.h rename to include/RE/B/BGSAimDownSightModel.h diff --git a/CommonLibSF/include/RE/B/BGSAimModel.h b/include/RE/B/BGSAimModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAimModel.h rename to include/RE/B/BGSAimModel.h diff --git a/CommonLibSF/include/RE/B/BGSAimOpticalSightModel.h b/include/RE/B/BGSAimOpticalSightModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAimOpticalSightModel.h rename to include/RE/B/BGSAimOpticalSightModel.h diff --git a/CommonLibSF/include/RE/B/BGSAmbienceSet.h b/include/RE/B/BGSAmbienceSet.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAmbienceSet.h rename to include/RE/B/BGSAmbienceSet.h diff --git a/CommonLibSF/include/RE/B/BGSAnimationGraphComponent.h b/include/RE/B/BGSAnimationGraphComponent.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAnimationGraphComponent.h rename to include/RE/B/BGSAnimationGraphComponent.h diff --git a/CommonLibSF/include/RE/B/BGSArtObject.h b/include/RE/B/BGSArtObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSArtObject.h rename to include/RE/B/BGSArtObject.h diff --git a/CommonLibSF/include/RE/B/BGSAtmosphere.h b/include/RE/B/BGSAtmosphere.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAtmosphere.h rename to include/RE/B/BGSAtmosphere.h diff --git a/CommonLibSF/include/RE/B/BGSAttachParentArray.h b/include/RE/B/BGSAttachParentArray.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAttachParentArray.h rename to include/RE/B/BGSAttachParentArray.h diff --git a/CommonLibSF/include/RE/B/BGSAttackDataForm.h b/include/RE/B/BGSAttackDataForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAttackDataForm.h rename to include/RE/B/BGSAttackDataForm.h diff --git a/CommonLibSF/include/RE/B/BGSAttractionRule.h b/include/RE/B/BGSAttractionRule.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAttractionRule.h rename to include/RE/B/BGSAttractionRule.h diff --git a/CommonLibSF/include/RE/B/BGSAudioOcclusionPrimitive.h b/include/RE/B/BGSAudioOcclusionPrimitive.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSAudioOcclusionPrimitive.h rename to include/RE/B/BGSAudioOcclusionPrimitive.h diff --git a/CommonLibSF/include/RE/B/BGSBaseForm.h b/include/RE/B/BGSBaseForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBaseForm.h rename to include/RE/B/BGSBaseForm.h diff --git a/CommonLibSF/include/RE/B/BGSBendableSpline.h b/include/RE/B/BGSBendableSpline.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBendableSpline.h rename to include/RE/B/BGSBendableSpline.h diff --git a/CommonLibSF/include/RE/B/BGSBiome.h b/include/RE/B/BGSBiome.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBiome.h rename to include/RE/B/BGSBiome.h diff --git a/CommonLibSF/include/RE/B/BGSBiomeMarkerObject.h b/include/RE/B/BGSBiomeMarkerObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBiomeMarkerObject.h rename to include/RE/B/BGSBiomeMarkerObject.h diff --git a/CommonLibSF/include/RE/B/BGSBipedObjectForm.h b/include/RE/B/BGSBipedObjectForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBipedObjectForm.h rename to include/RE/B/BGSBipedObjectForm.h diff --git a/CommonLibSF/include/RE/B/BGSBlockBashData.h b/include/RE/B/BGSBlockBashData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBlockBashData.h rename to include/RE/B/BGSBlockBashData.h diff --git a/CommonLibSF/include/RE/B/BGSBodyPartData.h b/include/RE/B/BGSBodyPartData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBodyPartData.h rename to include/RE/B/BGSBodyPartData.h diff --git a/CommonLibSF/include/RE/B/BGSBodyPartDefs.h b/include/RE/B/BGSBodyPartDefs.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBodyPartDefs.h rename to include/RE/B/BGSBodyPartDefs.h diff --git a/CommonLibSF/include/RE/B/BGSBodyPartInfo.h b/include/RE/B/BGSBodyPartInfo.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBodyPartInfo.h rename to include/RE/B/BGSBodyPartInfo.h diff --git a/CommonLibSF/include/RE/B/BGSBoneModifier.h b/include/RE/B/BGSBoneModifier.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSBoneModifier.h rename to include/RE/B/BGSBoneModifier.h diff --git a/CommonLibSF/include/RE/B/BGSCameraPath.h b/include/RE/B/BGSCameraPath.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCameraPath.h rename to include/RE/B/BGSCameraPath.h diff --git a/CommonLibSF/include/RE/B/BGSCameraShot.h b/include/RE/B/BGSCameraShot.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCameraShot.h rename to include/RE/B/BGSCameraShot.h diff --git a/CommonLibSF/include/RE/B/BGSChallengeForm.h b/include/RE/B/BGSChallengeForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSChallengeForm.h rename to include/RE/B/BGSChallengeForm.h diff --git a/CommonLibSF/include/RE/B/BGSCloudForm.h b/include/RE/B/BGSCloudForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCloudForm.h rename to include/RE/B/BGSCloudForm.h diff --git a/CommonLibSF/include/RE/B/BGSCollisionLayer.h b/include/RE/B/BGSCollisionLayer.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCollisionLayer.h rename to include/RE/B/BGSCollisionLayer.h diff --git a/CommonLibSF/include/RE/B/BGSColorForm.h b/include/RE/B/BGSColorForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSColorForm.h rename to include/RE/B/BGSColorForm.h diff --git a/CommonLibSF/include/RE/B/BGSConditionForm.h b/include/RE/B/BGSConditionForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSConditionForm.h rename to include/RE/B/BGSConditionForm.h diff --git a/CommonLibSF/include/RE/B/BGSConstructibleObject.h b/include/RE/B/BGSConstructibleObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSConstructibleObject.h rename to include/RE/B/BGSConstructibleObject.h diff --git a/CommonLibSF/include/RE/B/BGSCraftableForm.h b/include/RE/B/BGSCraftableForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCraftableForm.h rename to include/RE/B/BGSCraftableForm.h diff --git a/CommonLibSF/include/RE/B/BGSCraftingResourceOwner.h b/include/RE/B/BGSCraftingResourceOwner.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCraftingResourceOwner.h rename to include/RE/B/BGSCraftingResourceOwner.h diff --git a/CommonLibSF/include/RE/B/BGSCraftingUseSound.h b/include/RE/B/BGSCraftingUseSound.h similarity index 94% rename from CommonLibSF/include/RE/B/BGSCraftingUseSound.h rename to include/RE/B/BGSCraftingUseSound.h index 87ac5bc5..8199d22e 100644 --- a/CommonLibSF/include/RE/B/BGSCraftingUseSound.h +++ b/include/RE/B/BGSCraftingUseSound.h @@ -1,7 +1,7 @@ #pragma once #include "RE/B/BaseFormComponent.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/B/BGSCurve3DForm.h b/include/RE/B/BGSCurve3DForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCurve3DForm.h rename to include/RE/B/BGSCurve3DForm.h diff --git a/CommonLibSF/include/RE/B/BGSCurveForm.h b/include/RE/B/BGSCurveForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSCurveForm.h rename to include/RE/B/BGSCurveForm.h diff --git a/CommonLibSF/include/RE/B/BGSDamageType.h b/include/RE/B/BGSDamageType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSDamageType.h rename to include/RE/B/BGSDamageType.h diff --git a/CommonLibSF/include/RE/B/BGSDebris.h b/include/RE/B/BGSDebris.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSDebris.h rename to include/RE/B/BGSDebris.h diff --git a/CommonLibSF/include/RE/B/BGSDefaultObject.h b/include/RE/B/BGSDefaultObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSDefaultObject.h rename to include/RE/B/BGSDefaultObject.h diff --git a/CommonLibSF/include/RE/B/BGSDefaultObjectManager.h b/include/RE/B/BGSDefaultObjectManager.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSDefaultObjectManager.h rename to include/RE/B/BGSDefaultObjectManager.h diff --git a/CommonLibSF/include/RE/B/BGSDestructibleObjectForm.h b/include/RE/B/BGSDestructibleObjectForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSDestructibleObjectForm.h rename to include/RE/B/BGSDestructibleObjectForm.h diff --git a/CommonLibSF/include/RE/B/BGSDirectionalAmbientLightingColors.h b/include/RE/B/BGSDirectionalAmbientLightingColors.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSDirectionalAmbientLightingColors.h rename to include/RE/B/BGSDirectionalAmbientLightingColors.h diff --git a/CommonLibSF/include/RE/B/BGSEditorID.h b/include/RE/B/BGSEditorID.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSEditorID.h rename to include/RE/B/BGSEditorID.h diff --git a/CommonLibSF/include/RE/B/BGSEffectSequenceForm.h b/include/RE/B/BGSEffectSequenceForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSEffectSequenceForm.h rename to include/RE/B/BGSEffectSequenceForm.h diff --git a/CommonLibSF/include/RE/B/BGSEntryPoint.h b/include/RE/B/BGSEntryPoint.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSEntryPoint.h rename to include/RE/B/BGSEntryPoint.h diff --git a/CommonLibSF/include/RE/B/BGSEquipIndex.h b/include/RE/B/BGSEquipIndex.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSEquipIndex.h rename to include/RE/B/BGSEquipIndex.h diff --git a/CommonLibSF/include/RE/B/BGSEquipSlot.h b/include/RE/B/BGSEquipSlot.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSEquipSlot.h rename to include/RE/B/BGSEquipSlot.h diff --git a/CommonLibSF/include/RE/B/BGSEquipType.h b/include/RE/B/BGSEquipType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSEquipType.h rename to include/RE/B/BGSEquipType.h diff --git a/CommonLibSF/include/RE/B/BGSExplosion.h b/include/RE/B/BGSExplosion.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSExplosion.h rename to include/RE/B/BGSExplosion.h diff --git a/CommonLibSF/include/RE/B/BGSFeaturedItemMessage.h b/include/RE/B/BGSFeaturedItemMessage.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSFeaturedItemMessage.h rename to include/RE/B/BGSFeaturedItemMessage.h diff --git a/CommonLibSF/include/RE/B/BGSFogVolumeForm.h b/include/RE/B/BGSFogVolumeForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSFogVolumeForm.h rename to include/RE/B/BGSFogVolumeForm.h diff --git a/CommonLibSF/include/RE/B/BGSFootstep.h b/include/RE/B/BGSFootstep.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSFootstep.h rename to include/RE/B/BGSFootstep.h diff --git a/CommonLibSF/include/RE/B/BGSFootstepSet.h b/include/RE/B/BGSFootstepSet.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSFootstepSet.h rename to include/RE/B/BGSFootstepSet.h diff --git a/CommonLibSF/include/RE/B/BGSForceData.h b/include/RE/B/BGSForceData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSForceData.h rename to include/RE/B/BGSForceData.h diff --git a/CommonLibSF/include/RE/B/BGSForcedLocRefType.h b/include/RE/B/BGSForcedLocRefType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSForcedLocRefType.h rename to include/RE/B/BGSForcedLocRefType.h diff --git a/CommonLibSF/include/RE/B/BGSFormFolderKeywordList.h b/include/RE/B/BGSFormFolderKeywordList.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSFormFolderKeywordList.h rename to include/RE/B/BGSFormFolderKeywordList.h diff --git a/CommonLibSF/include/RE/B/BGSGenericBaseForm.h b/include/RE/B/BGSGenericBaseForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSGenericBaseForm.h rename to include/RE/B/BGSGenericBaseForm.h diff --git a/CommonLibSF/include/RE/B/BGSGenericBaseFormTemplate.h b/include/RE/B/BGSGenericBaseFormTemplate.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSGenericBaseFormTemplate.h rename to include/RE/B/BGSGenericBaseFormTemplate.h diff --git a/CommonLibSF/include/RE/B/BGSGroundCover.h b/include/RE/B/BGSGroundCover.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSGroundCover.h rename to include/RE/B/BGSGroundCover.h diff --git a/CommonLibSF/include/RE/B/BGSHazard.h b/include/RE/B/BGSHazard.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSHazard.h rename to include/RE/B/BGSHazard.h diff --git a/CommonLibSF/include/RE/B/BGSHeadPart.h b/include/RE/B/BGSHeadPart.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSHeadPart.h rename to include/RE/B/BGSHeadPart.h diff --git a/CommonLibSF/include/RE/B/BGSIdleCollection.h b/include/RE/B/BGSIdleCollection.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSIdleCollection.h rename to include/RE/B/BGSIdleCollection.h diff --git a/CommonLibSF/include/RE/B/BGSIdleMarker.h b/include/RE/B/BGSIdleMarker.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSIdleMarker.h rename to include/RE/B/BGSIdleMarker.h diff --git a/CommonLibSF/include/RE/B/BGSImpactData.h b/include/RE/B/BGSImpactData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSImpactData.h rename to include/RE/B/BGSImpactData.h diff --git a/CommonLibSF/include/RE/B/BGSImpactDataSet.h b/include/RE/B/BGSImpactDataSet.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSImpactDataSet.h rename to include/RE/B/BGSImpactDataSet.h diff --git a/CommonLibSF/include/RE/B/BGSInstanceNamingRules.h b/include/RE/B/BGSInstanceNamingRules.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSInstanceNamingRules.h rename to include/RE/B/BGSInstanceNamingRules.h diff --git a/CommonLibSF/include/RE/B/BGSInstanceNamingRulesForm.h b/include/RE/B/BGSInstanceNamingRulesForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSInstanceNamingRulesForm.h rename to include/RE/B/BGSInstanceNamingRulesForm.h diff --git a/CommonLibSF/include/RE/B/BGSInventoryInterface.h b/include/RE/B/BGSInventoryInterface.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSInventoryInterface.h rename to include/RE/B/BGSInventoryInterface.h diff --git a/CommonLibSF/include/RE/B/BGSInventoryItem.h b/include/RE/B/BGSInventoryItem.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSInventoryItem.h rename to include/RE/B/BGSInventoryItem.h diff --git a/CommonLibSF/include/RE/B/BGSInventoryList.h b/include/RE/B/BGSInventoryList.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSInventoryList.h rename to include/RE/B/BGSInventoryList.h diff --git a/CommonLibSF/include/RE/B/BGSKeyword.h b/include/RE/B/BGSKeyword.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSKeyword.h rename to include/RE/B/BGSKeyword.h diff --git a/CommonLibSF/include/RE/B/BGSKeywordForm.h b/include/RE/B/BGSKeywordForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSKeywordForm.h rename to include/RE/B/BGSKeywordForm.h diff --git a/CommonLibSF/include/RE/B/BGSLayeredMaterialSwap.h b/include/RE/B/BGSLayeredMaterialSwap.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLayeredMaterialSwap.h rename to include/RE/B/BGSLayeredMaterialSwap.h diff --git a/CommonLibSF/include/RE/B/BGSLegendaryItem.h b/include/RE/B/BGSLegendaryItem.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLegendaryItem.h rename to include/RE/B/BGSLegendaryItem.h diff --git a/CommonLibSF/include/RE/B/BGSLensFlare.h b/include/RE/B/BGSLensFlare.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLensFlare.h rename to include/RE/B/BGSLensFlare.h diff --git a/CommonLibSF/include/RE/B/BGSLevGenericBaseForm.h b/include/RE/B/BGSLevGenericBaseForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLevGenericBaseForm.h rename to include/RE/B/BGSLevGenericBaseForm.h diff --git a/CommonLibSF/include/RE/B/BGSLevPackIn.h b/include/RE/B/BGSLevPackIn.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLevPackIn.h rename to include/RE/B/BGSLevPackIn.h diff --git a/CommonLibSF/include/RE/B/BGSLevSpaceCell.h b/include/RE/B/BGSLevSpaceCell.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLevSpaceCell.h rename to include/RE/B/BGSLevSpaceCell.h diff --git a/CommonLibSF/include/RE/B/BGSLightingTemplate.h b/include/RE/B/BGSLightingTemplate.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLightingTemplate.h rename to include/RE/B/BGSLightingTemplate.h diff --git a/CommonLibSF/include/RE/B/BGSListForm.h b/include/RE/B/BGSListForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSListForm.h rename to include/RE/B/BGSListForm.h diff --git a/CommonLibSF/include/RE/B/BGSLocalizedString.h b/include/RE/B/BGSLocalizedString.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLocalizedString.h rename to include/RE/B/BGSLocalizedString.h diff --git a/CommonLibSF/include/RE/B/BGSLocalizedStringDL.h b/include/RE/B/BGSLocalizedStringDL.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLocalizedStringDL.h rename to include/RE/B/BGSLocalizedStringDL.h diff --git a/CommonLibSF/include/RE/B/BGSLocation.h b/include/RE/B/BGSLocation.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLocation.h rename to include/RE/B/BGSLocation.h diff --git a/CommonLibSF/include/RE/B/BGSLocationRefType.h b/include/RE/B/BGSLocationRefType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSLocationRefType.h rename to include/RE/B/BGSLocationRefType.h diff --git a/CommonLibSF/include/RE/B/BGSMaterialPathForm.h b/include/RE/B/BGSMaterialPathForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMaterialPathForm.h rename to include/RE/B/BGSMaterialPathForm.h diff --git a/CommonLibSF/include/RE/B/BGSMaterialType.h b/include/RE/B/BGSMaterialType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMaterialType.h rename to include/RE/B/BGSMaterialType.h diff --git a/CommonLibSF/include/RE/B/BGSMeleeAimAssistModel.h b/include/RE/B/BGSMeleeAimAssistModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMeleeAimAssistModel.h rename to include/RE/B/BGSMeleeAimAssistModel.h diff --git a/CommonLibSF/include/RE/B/BGSMenuDisplayObject.h b/include/RE/B/BGSMenuDisplayObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMenuDisplayObject.h rename to include/RE/B/BGSMenuDisplayObject.h diff --git a/CommonLibSF/include/RE/B/BGSMessage.h b/include/RE/B/BGSMessage.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMessage.h rename to include/RE/B/BGSMessage.h diff --git a/CommonLibSF/include/RE/B/BGSMod.h b/include/RE/B/BGSMod.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMod.h rename to include/RE/B/BGSMod.h diff --git a/CommonLibSF/include/RE/B/BGSModelMaterialSwap.h b/include/RE/B/BGSModelMaterialSwap.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSModelMaterialSwap.h rename to include/RE/B/BGSModelMaterialSwap.h diff --git a/CommonLibSF/include/RE/B/BGSMorphableObject.h b/include/RE/B/BGSMorphableObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMorphableObject.h rename to include/RE/B/BGSMorphableObject.h diff --git a/CommonLibSF/include/RE/B/BGSMovableStatic.h b/include/RE/B/BGSMovableStatic.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMovableStatic.h rename to include/RE/B/BGSMovableStatic.h diff --git a/CommonLibSF/include/RE/B/BGSMovementType.h b/include/RE/B/BGSMovementType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSMovementType.h rename to include/RE/B/BGSMovementType.h diff --git a/CommonLibSF/include/RE/B/BGSNativeTerminalForm.h b/include/RE/B/BGSNativeTerminalForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSNativeTerminalForm.h rename to include/RE/B/BGSNativeTerminalForm.h diff --git a/CommonLibSF/include/RE/B/BGSNavmeshableObject.h b/include/RE/B/BGSNavmeshableObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSNavmeshableObject.h rename to include/RE/B/BGSNavmeshableObject.h diff --git a/CommonLibSF/include/RE/B/BGSObjectInstance.h b/include/RE/B/BGSObjectInstance.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSObjectInstance.h rename to include/RE/B/BGSObjectInstance.h diff --git a/CommonLibSF/include/RE/B/BGSObjectPlacementDefaults.h b/include/RE/B/BGSObjectPlacementDefaults.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSObjectPlacementDefaults.h rename to include/RE/B/BGSObjectPlacementDefaults.h diff --git a/CommonLibSF/include/RE/B/BGSObjectSwap.h b/include/RE/B/BGSObjectSwap.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSObjectSwap.h rename to include/RE/B/BGSObjectSwap.h diff --git a/CommonLibSF/include/RE/B/BGSOpenCloseForm.h b/include/RE/B/BGSOpenCloseForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSOpenCloseForm.h rename to include/RE/B/BGSOpenCloseForm.h diff --git a/CommonLibSF/include/RE/B/BGSOutfit.h b/include/RE/B/BGSOutfit.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSOutfit.h rename to include/RE/B/BGSOutfit.h diff --git a/CommonLibSF/include/RE/B/BGSOverridePackCollection.h b/include/RE/B/BGSOverridePackCollection.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSOverridePackCollection.h rename to include/RE/B/BGSOverridePackCollection.h diff --git a/CommonLibSF/include/RE/B/BGSPackIn.h b/include/RE/B/BGSPackIn.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPackIn.h rename to include/RE/B/BGSPackIn.h diff --git a/CommonLibSF/include/RE/B/BGSParticleSystemDefineCollection.h b/include/RE/B/BGSParticleSystemDefineCollection.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSParticleSystemDefineCollection.h rename to include/RE/B/BGSParticleSystemDefineCollection.h diff --git a/CommonLibSF/include/RE/B/BGSPerk.h b/include/RE/B/BGSPerk.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPerk.h rename to include/RE/B/BGSPerk.h diff --git a/CommonLibSF/include/RE/B/BGSPerkRankArray.h b/include/RE/B/BGSPerkRankArray.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPerkRankArray.h rename to include/RE/B/BGSPerkRankArray.h diff --git a/CommonLibSF/include/RE/B/BGSPersistentIDsForm.h b/include/RE/B/BGSPersistentIDsForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPersistentIDsForm.h rename to include/RE/B/BGSPersistentIDsForm.h diff --git a/CommonLibSF/include/RE/B/BGSPhotoModeFeature.h b/include/RE/B/BGSPhotoModeFeature.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPhotoModeFeature.h rename to include/RE/B/BGSPhotoModeFeature.h diff --git a/CommonLibSF/include/RE/B/BGSPickupPutdownSounds.h b/include/RE/B/BGSPickupPutdownSounds.h similarity index 95% rename from CommonLibSF/include/RE/B/BGSPickupPutdownSounds.h rename to include/RE/B/BGSPickupPutdownSounds.h index d2695db6..52a6875e 100644 --- a/CommonLibSF/include/RE/B/BGSPickupPutdownSounds.h +++ b/include/RE/B/BGSPickupPutdownSounds.h @@ -1,7 +1,7 @@ #pragma once #include "RE/B/BaseFormComponent.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/B/BGSPlanetData.h b/include/RE/B/BGSPlanetData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPlanetData.h rename to include/RE/B/BGSPlanetData.h diff --git a/CommonLibSF/include/RE/B/BGSPreloadable.h b/include/RE/B/BGSPreloadable.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPreloadable.h rename to include/RE/B/BGSPreloadable.h diff --git a/CommonLibSF/include/RE/B/BGSPreviewTransform.h b/include/RE/B/BGSPreviewTransform.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPreviewTransform.h rename to include/RE/B/BGSPreviewTransform.h diff --git a/CommonLibSF/include/RE/B/BGSProjectedDecal.h b/include/RE/B/BGSProjectedDecal.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSProjectedDecal.h rename to include/RE/B/BGSProjectedDecal.h diff --git a/CommonLibSF/include/RE/B/BGSProjectile.h b/include/RE/B/BGSProjectile.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSProjectile.h rename to include/RE/B/BGSProjectile.h diff --git a/CommonLibSF/include/RE/B/BGSPropertySheet.h b/include/RE/B/BGSPropertySheet.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSPropertySheet.h rename to include/RE/B/BGSPropertySheet.h diff --git a/CommonLibSF/include/RE/B/BGSReferenceGroup.h b/include/RE/B/BGSReferenceGroup.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSReferenceGroup.h rename to include/RE/B/BGSReferenceGroup.h diff --git a/CommonLibSF/include/RE/B/BGSReflectedForm.h b/include/RE/B/BGSReflectedForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSReflectedForm.h rename to include/RE/B/BGSReflectedForm.h diff --git a/CommonLibSF/include/RE/B/BGSResearchProjectForm.h b/include/RE/B/BGSResearchProjectForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSResearchProjectForm.h rename to include/RE/B/BGSResearchProjectForm.h diff --git a/CommonLibSF/include/RE/B/BGSResource.h b/include/RE/B/BGSResource.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSResource.h rename to include/RE/B/BGSResource.h diff --git a/CommonLibSF/include/RE/B/BGSResourceGenerationData.h b/include/RE/B/BGSResourceGenerationData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSResourceGenerationData.h rename to include/RE/B/BGSResourceGenerationData.h diff --git a/CommonLibSF/include/RE/B/BGSReverbParameters.h b/include/RE/B/BGSReverbParameters.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSReverbParameters.h rename to include/RE/B/BGSReverbParameters.h diff --git a/CommonLibSF/include/RE/B/BGSSaveLoadManager.h b/include/RE/B/BGSSaveLoadManager.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSaveLoadManager.h rename to include/RE/B/BGSSaveLoadManager.h diff --git a/CommonLibSF/include/RE/B/BGSScene.h b/include/RE/B/BGSScene.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSScene.h rename to include/RE/B/BGSScene.h diff --git a/CommonLibSF/include/RE/B/BGSSecondaryDamageList.h b/include/RE/B/BGSSecondaryDamageList.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSecondaryDamageList.h rename to include/RE/B/BGSSecondaryDamageList.h diff --git a/CommonLibSF/include/RE/B/BGSShaderParticleGeometryData.h b/include/RE/B/BGSShaderParticleGeometryData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSShaderParticleGeometryData.h rename to include/RE/B/BGSShaderParticleGeometryData.h diff --git a/CommonLibSF/include/RE/B/BGSSkinForm.h b/include/RE/B/BGSSkinForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSkinForm.h rename to include/RE/B/BGSSkinForm.h diff --git a/CommonLibSF/include/RE/B/BGSSnapBehavior.h b/include/RE/B/BGSSnapBehavior.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSnapBehavior.h rename to include/RE/B/BGSSnapBehavior.h diff --git a/CommonLibSF/include/RE/B/BGSSnapTemplate.h b/include/RE/B/BGSSnapTemplate.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSnapTemplate.h rename to include/RE/B/BGSSnapTemplate.h diff --git a/CommonLibSF/include/RE/B/BGSSnapTemplateComponent.h b/include/RE/B/BGSSnapTemplateComponent.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSnapTemplateComponent.h rename to include/RE/B/BGSSnapTemplateComponent.h diff --git a/CommonLibSF/include/RE/B/BGSSnapTemplateNode.h b/include/RE/B/BGSSnapTemplateNode.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSnapTemplateNode.h rename to include/RE/B/BGSSnapTemplateNode.h diff --git a/CommonLibSF/include/RE/B/BGSSoundEcho.h b/include/RE/B/BGSSoundEcho.h similarity index 92% rename from CommonLibSF/include/RE/B/BGSSoundEcho.h rename to include/RE/B/BGSSoundEcho.h index 9bf92895..a2a59320 100644 --- a/CommonLibSF/include/RE/B/BGSSoundEcho.h +++ b/include/RE/B/BGSSoundEcho.h @@ -2,7 +2,7 @@ #include "RE/B/BSTArray.h" #include "RE/T/TESBoundAnimObject.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/B/BGSSoundKeywordMapping.h b/include/RE/B/BGSSoundKeywordMapping.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSoundKeywordMapping.h rename to include/RE/B/BGSSoundKeywordMapping.h diff --git a/CommonLibSF/include/RE/B/BGSSoundTagSet.h b/include/RE/B/BGSSoundTagSet.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSoundTagSet.h rename to include/RE/B/BGSSoundTagSet.h diff --git a/CommonLibSF/include/RE/B/BGSSpeechChallengeObject.h b/include/RE/B/BGSSpeechChallengeObject.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSpeechChallengeObject.h rename to include/RE/B/BGSSpeechChallengeObject.h diff --git a/CommonLibSF/include/RE/B/BGSStar.h b/include/RE/B/BGSStar.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSStar.h rename to include/RE/B/BGSStar.h diff --git a/CommonLibSF/include/RE/B/BGSStaticCollection.h b/include/RE/B/BGSStaticCollection.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSStaticCollection.h rename to include/RE/B/BGSStaticCollection.h diff --git a/CommonLibSF/include/RE/B/BGSSunPresetForm.h b/include/RE/B/BGSSunPresetForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSunPresetForm.h rename to include/RE/B/BGSSunPresetForm.h diff --git a/CommonLibSF/include/RE/B/BGSSurfaceBlock.h b/include/RE/B/BGSSurfaceBlock.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSurfaceBlock.h rename to include/RE/B/BGSSurfaceBlock.h diff --git a/CommonLibSF/include/RE/B/BGSSurfacePattern.h b/include/RE/B/BGSSurfacePattern.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSurfacePattern.h rename to include/RE/B/BGSSurfacePattern.h diff --git a/CommonLibSF/include/RE/B/BGSSurfacePatternStyle.h b/include/RE/B/BGSSurfacePatternStyle.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSurfacePatternStyle.h rename to include/RE/B/BGSSurfacePatternStyle.h diff --git a/CommonLibSF/include/RE/B/BGSSurfaceTree.h b/include/RE/B/BGSSurfaceTree.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSSurfaceTree.h rename to include/RE/B/BGSSurfaceTree.h diff --git a/CommonLibSF/include/RE/B/BGSTalkingActivator.h b/include/RE/B/BGSTalkingActivator.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTalkingActivator.h rename to include/RE/B/BGSTalkingActivator.h diff --git a/CommonLibSF/include/RE/B/BGSTerminal.h b/include/RE/B/BGSTerminal.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTerminal.h rename to include/RE/B/BGSTerminal.h diff --git a/CommonLibSF/include/RE/B/BGSTerminalMenu.h b/include/RE/B/BGSTerminalMenu.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTerminalMenu.h rename to include/RE/B/BGSTerminalMenu.h diff --git a/CommonLibSF/include/RE/B/BGSTextureModel.h b/include/RE/B/BGSTextureModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTextureModel.h rename to include/RE/B/BGSTextureModel.h diff --git a/CommonLibSF/include/RE/B/BGSTextureSet.h b/include/RE/B/BGSTextureSet.h similarity index 97% rename from CommonLibSF/include/RE/B/BGSTextureSet.h rename to include/RE/B/BGSTextureSet.h index d9cf8244..9a3fa7ae 100644 --- a/CommonLibSF/include/RE/B/BGSTextureSet.h +++ b/include/RE/B/BGSTextureSet.h @@ -5,7 +5,7 @@ namespace RE { - class DecalData; + struct DecalData; namespace TextureUtils { diff --git a/CommonLibSF/include/RE/B/BGSTimeOfDayData.h b/include/RE/B/BGSTimeOfDayData.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTimeOfDayData.h rename to include/RE/B/BGSTimeOfDayData.h diff --git a/CommonLibSF/include/RE/B/BGSTransform.h b/include/RE/B/BGSTransform.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTransform.h rename to include/RE/B/BGSTransform.h diff --git a/CommonLibSF/include/RE/B/BGSTraversal.h b/include/RE/B/BGSTraversal.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTraversal.h rename to include/RE/B/BGSTraversal.h diff --git a/CommonLibSF/include/RE/B/BGSTypedFormValuePair.h b/include/RE/B/BGSTypedFormValuePair.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTypedFormValuePair.h rename to include/RE/B/BGSTypedFormValuePair.h diff --git a/CommonLibSF/include/RE/B/BGSTypedKeywordValueArray.h b/include/RE/B/BGSTypedKeywordValueArray.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSTypedKeywordValueArray.h rename to include/RE/B/BGSTypedKeywordValueArray.h diff --git a/CommonLibSF/include/RE/B/BGSVoiceType.h b/include/RE/B/BGSVoiceType.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSVoiceType.h rename to include/RE/B/BGSVoiceType.h diff --git a/CommonLibSF/include/RE/B/BGSVolumetricLighting.h b/include/RE/B/BGSVolumetricLighting.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSVolumetricLighting.h rename to include/RE/B/BGSVolumetricLighting.h diff --git a/CommonLibSF/include/RE/B/BGSWeaponBarrelModel.h b/include/RE/B/BGSWeaponBarrelModel.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSWeaponBarrelModel.h rename to include/RE/B/BGSWeaponBarrelModel.h diff --git a/CommonLibSF/include/RE/B/BGSWeatherSettingsForm.h b/include/RE/B/BGSWeatherSettingsForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSWeatherSettingsForm.h rename to include/RE/B/BGSWeatherSettingsForm.h diff --git a/CommonLibSF/include/RE/B/BGSWwiseEventForm.h b/include/RE/B/BGSWwiseEventForm.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSWwiseEventForm.h rename to include/RE/B/BGSWwiseEventForm.h diff --git a/CommonLibSF/include/RE/B/BGSWwiseKeywordMapping.h b/include/RE/B/BGSWwiseKeywordMapping.h similarity index 100% rename from CommonLibSF/include/RE/B/BGSWwiseKeywordMapping.h rename to include/RE/B/BGSWwiseKeywordMapping.h diff --git a/CommonLibSF/include/RE/B/BSBlendable.h b/include/RE/B/BSBlendable.h similarity index 100% rename from CommonLibSF/include/RE/B/BSBlendable.h rename to include/RE/B/BSBlendable.h diff --git a/CommonLibSF/include/RE/B/BSColorCurve.h b/include/RE/B/BSColorCurve.h similarity index 100% rename from CommonLibSF/include/RE/B/BSColorCurve.h rename to include/RE/B/BSColorCurve.h diff --git a/CommonLibSF/include/RE/B/BSContainer.h b/include/RE/B/BSContainer.h similarity index 100% rename from CommonLibSF/include/RE/B/BSContainer.h rename to include/RE/B/BSContainer.h diff --git a/CommonLibSF/include/RE/B/BSExtraData.h b/include/RE/B/BSExtraData.h similarity index 100% rename from CommonLibSF/include/RE/B/BSExtraData.h rename to include/RE/B/BSExtraData.h diff --git a/CommonLibSF/include/RE/B/BSFixedString.h b/include/RE/B/BSFixedString.h similarity index 100% rename from CommonLibSF/include/RE/B/BSFixedString.h rename to include/RE/B/BSFixedString.h diff --git a/CommonLibSF/include/RE/B/BSFloat3DCurve.h b/include/RE/B/BSFloat3DCurve.h similarity index 100% rename from CommonLibSF/include/RE/B/BSFloat3DCurve.h rename to include/RE/B/BSFloat3DCurve.h diff --git a/CommonLibSF/include/RE/B/BSFloatCurve.h b/include/RE/B/BSFloatCurve.h similarity index 100% rename from CommonLibSF/include/RE/B/BSFloatCurve.h rename to include/RE/B/BSFloatCurve.h diff --git a/CommonLibSF/include/RE/B/BSInputEnableLayer.h b/include/RE/B/BSInputEnableLayer.h similarity index 100% rename from CommonLibSF/include/RE/B/BSInputEnableLayer.h rename to include/RE/B/BSInputEnableLayer.h diff --git a/CommonLibSF/include/RE/B/BSInputEnableManager.h b/include/RE/B/BSInputEnableManager.h similarity index 100% rename from CommonLibSF/include/RE/B/BSInputEnableManager.h rename to include/RE/B/BSInputEnableManager.h diff --git a/CommonLibSF/include/RE/B/BSInputEventReceiver.h b/include/RE/B/BSInputEventReceiver.h similarity index 100% rename from CommonLibSF/include/RE/B/BSInputEventReceiver.h rename to include/RE/B/BSInputEventReceiver.h diff --git a/CommonLibSF/include/RE/B/BSInputEventUser.h b/include/RE/B/BSInputEventUser.h similarity index 100% rename from CommonLibSF/include/RE/B/BSInputEventUser.h rename to include/RE/B/BSInputEventUser.h diff --git a/CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h b/include/RE/B/BSIntrusiveRefCounted.h similarity index 100% rename from CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h rename to include/RE/B/BSIntrusiveRefCounted.h diff --git a/CommonLibSF/include/RE/B/BSLock.h b/include/RE/B/BSLock.h similarity index 100% rename from CommonLibSF/include/RE/B/BSLock.h rename to include/RE/B/BSLock.h diff --git a/CommonLibSF/include/RE/B/BSLog.h b/include/RE/B/BSLog.h similarity index 100% rename from CommonLibSF/include/RE/B/BSLog.h rename to include/RE/B/BSLog.h diff --git a/CommonLibSF/include/RE/B/BSReflection.h b/include/RE/B/BSReflection.h similarity index 100% rename from CommonLibSF/include/RE/B/BSReflection.h rename to include/RE/B/BSReflection.h diff --git a/CommonLibSF/include/RE/B/BSStringPool.h b/include/RE/B/BSStringPool.h similarity index 100% rename from CommonLibSF/include/RE/B/BSStringPool.h rename to include/RE/B/BSStringPool.h diff --git a/CommonLibSF/include/RE/B/BSStringT.h b/include/RE/B/BSStringT.h similarity index 100% rename from CommonLibSF/include/RE/B/BSStringT.h rename to include/RE/B/BSStringT.h diff --git a/CommonLibSF/include/RE/B/BSSystemFile.h b/include/RE/B/BSSystemFile.h similarity index 100% rename from CommonLibSF/include/RE/B/BSSystemFile.h rename to include/RE/B/BSSystemFile.h diff --git a/CommonLibSF/include/RE/B/BSTArray.h b/include/RE/B/BSTArray.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTArray.h rename to include/RE/B/BSTArray.h diff --git a/CommonLibSF/include/RE/B/BSTEvent.h b/include/RE/B/BSTEvent.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTEvent.h rename to include/RE/B/BSTEvent.h diff --git a/CommonLibSF/include/RE/B/BSTList.h b/include/RE/B/BSTList.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTList.h rename to include/RE/B/BSTList.h diff --git a/CommonLibSF/include/RE/B/BSTOptional.h b/include/RE/B/BSTOptional.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTOptional.h rename to include/RE/B/BSTOptional.h diff --git a/CommonLibSF/include/RE/B/BSTScatterTable.h b/include/RE/B/BSTScatterTable.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTScatterTable.h rename to include/RE/B/BSTScatterTable.h diff --git a/CommonLibSF/include/RE/B/BSTSingleton.h b/include/RE/B/BSTSingleton.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTSingleton.h rename to include/RE/B/BSTSingleton.h diff --git a/CommonLibSF/include/RE/B/BSTSmartPointer.h b/include/RE/B/BSTSmartPointer.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTSmartPointer.h rename to include/RE/B/BSTSmartPointer.h diff --git a/CommonLibSF/include/RE/B/BSTTuple.h b/include/RE/B/BSTTuple.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTTuple.h rename to include/RE/B/BSTTuple.h diff --git a/CommonLibSF/include/RE/B/BSTTuple3.h b/include/RE/B/BSTTuple3.h similarity index 100% rename from CommonLibSF/include/RE/B/BSTTuple3.h rename to include/RE/B/BSTTuple3.h diff --git a/CommonLibSF/include/RE/B/BarrierProjectile.h b/include/RE/B/BarrierProjectile.h similarity index 100% rename from CommonLibSF/include/RE/B/BarrierProjectile.h rename to include/RE/B/BarrierProjectile.h diff --git a/CommonLibSF/include/RE/B/BaseFormComponent.h b/include/RE/B/BaseFormComponent.h similarity index 100% rename from CommonLibSF/include/RE/B/BaseFormComponent.h rename to include/RE/B/BaseFormComponent.h diff --git a/CommonLibSF/include/RE/B/BeamProjectile.h b/include/RE/B/BeamProjectile.h similarity index 100% rename from CommonLibSF/include/RE/B/BeamProjectile.h rename to include/RE/B/BeamProjectile.h diff --git a/CommonLibSF/include/RE/C/CodeTasklet.h b/include/RE/C/CodeTasklet.h similarity index 100% rename from CommonLibSF/include/RE/C/CodeTasklet.h rename to include/RE/C/CodeTasklet.h diff --git a/CommonLibSF/include/RE/C/CollisionLayers.h b/include/RE/C/CollisionLayers.h similarity index 100% rename from CommonLibSF/include/RE/C/CollisionLayers.h rename to include/RE/C/CollisionLayers.h diff --git a/CommonLibSF/include/RE/C/Color.h b/include/RE/C/Color.h similarity index 100% rename from CommonLibSF/include/RE/C/Color.h rename to include/RE/C/Color.h diff --git a/CommonLibSF/include/RE/C/CombatGroup.h b/include/RE/C/CombatGroup.h similarity index 100% rename from CommonLibSF/include/RE/C/CombatGroup.h rename to include/RE/C/CombatGroup.h diff --git a/CommonLibSF/include/RE/C/ConeProjectile.h b/include/RE/C/ConeProjectile.h similarity index 100% rename from CommonLibSF/include/RE/C/ConeProjectile.h rename to include/RE/C/ConeProjectile.h diff --git a/CommonLibSF/include/RE/C/Console.h b/include/RE/C/Console.h similarity index 100% rename from CommonLibSF/include/RE/C/Console.h rename to include/RE/C/Console.h diff --git a/CommonLibSF/include/RE/C/ConsoleLog.h b/include/RE/C/ConsoleLog.h similarity index 100% rename from CommonLibSF/include/RE/C/ConsoleLog.h rename to include/RE/C/ConsoleLog.h diff --git a/CommonLibSF/include/RE/D/DebuggerMessages.h b/include/RE/D/DebuggerMessages.h similarity index 100% rename from CommonLibSF/include/RE/D/DebuggerMessages.h rename to include/RE/D/DebuggerMessages.h diff --git a/CommonLibSF/include/RE/D/DecalData.h b/include/RE/D/DecalData.h similarity index 100% rename from CommonLibSF/include/RE/D/DecalData.h rename to include/RE/D/DecalData.h diff --git a/CommonLibSF/include/RE/E/EffectArchetypes.h b/include/RE/E/EffectArchetypes.h similarity index 100% rename from CommonLibSF/include/RE/E/EffectArchetypes.h rename to include/RE/E/EffectArchetypes.h diff --git a/CommonLibSF/include/RE/E/EffectItem.h b/include/RE/E/EffectItem.h similarity index 100% rename from CommonLibSF/include/RE/E/EffectItem.h rename to include/RE/E/EffectItem.h diff --git a/CommonLibSF/include/RE/E/EffectSetting.h b/include/RE/E/EffectSetting.h similarity index 100% rename from CommonLibSF/include/RE/E/EffectSetting.h rename to include/RE/E/EffectSetting.h diff --git a/CommonLibSF/include/RE/E/EmitterProjectile.h b/include/RE/E/EmitterProjectile.h similarity index 100% rename from CommonLibSF/include/RE/E/EmitterProjectile.h rename to include/RE/E/EmitterProjectile.h diff --git a/CommonLibSF/include/RE/E/EnchantmentItem.h b/include/RE/E/EnchantmentItem.h similarity index 100% rename from CommonLibSF/include/RE/E/EnchantmentItem.h rename to include/RE/E/EnchantmentItem.h diff --git a/CommonLibSF/include/RE/E/ErrorLogger.h b/include/RE/E/ErrorLogger.h similarity index 100% rename from CommonLibSF/include/RE/E/ErrorLogger.h rename to include/RE/E/ErrorLogger.h diff --git a/CommonLibSF/include/RE/E/ExtraDataList.h b/include/RE/E/ExtraDataList.h similarity index 100% rename from CommonLibSF/include/RE/E/ExtraDataList.h rename to include/RE/E/ExtraDataList.h diff --git a/CommonLibSF/include/RE/E/ExtraDataTypes.h b/include/RE/E/ExtraDataTypes.h similarity index 100% rename from CommonLibSF/include/RE/E/ExtraDataTypes.h rename to include/RE/E/ExtraDataTypes.h diff --git a/CommonLibSF/include/RE/E/ExtraLock.h b/include/RE/E/ExtraLock.h similarity index 100% rename from CommonLibSF/include/RE/E/ExtraLock.h rename to include/RE/E/ExtraLock.h diff --git a/CommonLibSF/include/RE/F/FORM_ENUM_STRING.h b/include/RE/F/FORM_ENUM_STRING.h similarity index 100% rename from CommonLibSF/include/RE/F/FORM_ENUM_STRING.h rename to include/RE/F/FORM_ENUM_STRING.h diff --git a/CommonLibSF/include/RE/F/FactionRank.h b/include/RE/F/FactionRank.h similarity index 100% rename from CommonLibSF/include/RE/F/FactionRank.h rename to include/RE/F/FactionRank.h diff --git a/CommonLibSF/include/RE/F/FlameProjectile.h b/include/RE/F/FlameProjectile.h similarity index 100% rename from CommonLibSF/include/RE/F/FlameProjectile.h rename to include/RE/F/FlameProjectile.h diff --git a/CommonLibSF/include/RE/F/FormTypes.h b/include/RE/F/FormTypes.h similarity index 100% rename from CommonLibSF/include/RE/F/FormTypes.h rename to include/RE/F/FormTypes.h diff --git a/CommonLibSF/include/RE/G/GameMenuBase.h b/include/RE/G/GameMenuBase.h similarity index 100% rename from CommonLibSF/include/RE/G/GameMenuBase.h rename to include/RE/G/GameMenuBase.h diff --git a/CommonLibSF/include/RE/G/GrenadeProjectile.h b/include/RE/G/GrenadeProjectile.h similarity index 100% rename from CommonLibSF/include/RE/G/GrenadeProjectile.h rename to include/RE/G/GrenadeProjectile.h diff --git a/CommonLibSF/include/RE/H/HandlePolicy.h b/include/RE/H/HandlePolicy.h similarity index 100% rename from CommonLibSF/include/RE/H/HandlePolicy.h rename to include/RE/H/HandlePolicy.h diff --git a/CommonLibSF/include/RE/H/Hazard.h b/include/RE/H/Hazard.h similarity index 100% rename from CommonLibSF/include/RE/H/Hazard.h rename to include/RE/H/Hazard.h diff --git a/CommonLibSF/include/RE/I/IAddressControllerStore.h b/include/RE/I/IAddressControllerStore.h similarity index 100% rename from CommonLibSF/include/RE/I/IAddressControllerStore.h rename to include/RE/I/IAddressControllerStore.h diff --git a/CommonLibSF/include/RE/I/IAnimationGraphManagerHolder.h b/include/RE/I/IAnimationGraphManagerHolder.h similarity index 100% rename from CommonLibSF/include/RE/I/IAnimationGraphManagerHolder.h rename to include/RE/I/IAnimationGraphManagerHolder.h diff --git a/CommonLibSF/include/RE/I/IBGSBaseFormData.h b/include/RE/I/IBGSBaseFormData.h similarity index 100% rename from CommonLibSF/include/RE/I/IBGSBaseFormData.h rename to include/RE/I/IBGSBaseFormData.h diff --git a/CommonLibSF/include/RE/I/ICachedErrorMessage.h b/include/RE/I/ICachedErrorMessage.h similarity index 100% rename from CommonLibSF/include/RE/I/ICachedErrorMessage.h rename to include/RE/I/ICachedErrorMessage.h diff --git a/CommonLibSF/include/RE/I/IComplexType.h b/include/RE/I/IComplexType.h similarity index 100% rename from CommonLibSF/include/RE/I/IComplexType.h rename to include/RE/I/IComplexType.h diff --git a/CommonLibSF/include/RE/I/IFuncCallQuery.h b/include/RE/I/IFuncCallQuery.h similarity index 100% rename from CommonLibSF/include/RE/I/IFuncCallQuery.h rename to include/RE/I/IFuncCallQuery.h diff --git a/CommonLibSF/include/RE/I/IFunction.h b/include/RE/I/IFunction.h similarity index 100% rename from CommonLibSF/include/RE/I/IFunction.h rename to include/RE/I/IFunction.h diff --git a/CommonLibSF/include/RE/I/IKeywordFormBase.h b/include/RE/I/IKeywordFormBase.h similarity index 100% rename from CommonLibSF/include/RE/I/IKeywordFormBase.h rename to include/RE/I/IKeywordFormBase.h diff --git a/CommonLibSF/include/RE/I/IMenu.h b/include/RE/I/IMenu.h similarity index 100% rename from CommonLibSF/include/RE/I/IMenu.h rename to include/RE/I/IMenu.h diff --git a/CommonLibSF/include/RE/I/IMovementInterface.h b/include/RE/I/IMovementInterface.h similarity index 100% rename from CommonLibSF/include/RE/I/IMovementInterface.h rename to include/RE/I/IMovementInterface.h diff --git a/CommonLibSF/include/RE/I/IMovementPlayerControlsFilter.h b/include/RE/I/IMovementPlayerControlsFilter.h similarity index 100% rename from CommonLibSF/include/RE/I/IMovementPlayerControlsFilter.h rename to include/RE/I/IMovementPlayerControlsFilter.h diff --git a/CommonLibSF/include/RE/I/IMovementState.h b/include/RE/I/IMovementState.h similarity index 100% rename from CommonLibSF/include/RE/I/IMovementState.h rename to include/RE/I/IMovementState.h diff --git a/CommonLibSF/include/RE/I/IMovementStateStore.h b/include/RE/I/IMovementStateStore.h similarity index 100% rename from CommonLibSF/include/RE/I/IMovementStateStore.h rename to include/RE/I/IMovementStateStore.h diff --git a/CommonLibSF/include/RE/I/INIPrefSettingCollection.h b/include/RE/I/INIPrefSettingCollection.h similarity index 100% rename from CommonLibSF/include/RE/I/INIPrefSettingCollection.h rename to include/RE/I/INIPrefSettingCollection.h diff --git a/CommonLibSF/include/RE/I/INISettingCollection.h b/include/RE/I/INISettingCollection.h similarity index 100% rename from CommonLibSF/include/RE/I/INISettingCollection.h rename to include/RE/I/INISettingCollection.h diff --git a/CommonLibSF/include/RE/I/IObjectHandlePolicy.h b/include/RE/I/IObjectHandlePolicy.h similarity index 100% rename from CommonLibSF/include/RE/I/IObjectHandlePolicy.h rename to include/RE/I/IObjectHandlePolicy.h diff --git a/CommonLibSF/include/RE/I/IPostAnimationChannelUpdateFunctor.h b/include/RE/I/IPostAnimationChannelUpdateFunctor.h similarity index 100% rename from CommonLibSF/include/RE/I/IPostAnimationChannelUpdateFunctor.h rename to include/RE/I/IPostAnimationChannelUpdateFunctor.h diff --git a/CommonLibSF/include/RE/I/ISavePatcherInterface.h b/include/RE/I/ISavePatcherInterface.h similarity index 100% rename from CommonLibSF/include/RE/I/ISavePatcherInterface.h rename to include/RE/I/ISavePatcherInterface.h diff --git a/CommonLibSF/include/RE/I/IStoreAnimationActions.h b/include/RE/I/IStoreAnimationActions.h similarity index 100% rename from CommonLibSF/include/RE/I/IStoreAnimationActions.h rename to include/RE/I/IStoreAnimationActions.h diff --git a/CommonLibSF/include/RE/I/IVMDebugInterface.h b/include/RE/I/IVMDebugInterface.h similarity index 100% rename from CommonLibSF/include/RE/I/IVMDebugInterface.h rename to include/RE/I/IVMDebugInterface.h diff --git a/CommonLibSF/include/RE/I/IVMFunctionMessageDispatch.h b/include/RE/I/IVMFunctionMessageDispatch.h similarity index 100% rename from CommonLibSF/include/RE/I/IVMFunctionMessageDispatch.h rename to include/RE/I/IVMFunctionMessageDispatch.h diff --git a/CommonLibSF/include/RE/I/IVMObjectBindInterface.h b/include/RE/I/IVMObjectBindInterface.h similarity index 100% rename from CommonLibSF/include/RE/I/IVMObjectBindInterface.h rename to include/RE/I/IVMObjectBindInterface.h diff --git a/CommonLibSF/include/RE/I/IVMRemoteDebuggerInterface.h b/include/RE/I/IVMRemoteDebuggerInterface.h similarity index 100% rename from CommonLibSF/include/RE/I/IVMRemoteDebuggerInterface.h rename to include/RE/I/IVMRemoteDebuggerInterface.h diff --git a/CommonLibSF/include/RE/I/IVMSaveLoadInterface.h b/include/RE/I/IVMSaveLoadInterface.h similarity index 100% rename from CommonLibSF/include/RE/I/IVMSaveLoadInterface.h rename to include/RE/I/IVMSaveLoadInterface.h diff --git a/CommonLibSF/include/RE/I/IVirtualMachine.h b/include/RE/I/IVirtualMachine.h similarity index 100% rename from CommonLibSF/include/RE/I/IVirtualMachine.h rename to include/RE/I/IVirtualMachine.h diff --git a/CommonLibSF/include/RE/I/ImpactResults.h b/include/RE/I/ImpactResults.h similarity index 100% rename from CommonLibSF/include/RE/I/ImpactResults.h rename to include/RE/I/ImpactResults.h diff --git a/CommonLibSF/include/RE/I/InteriorData.h b/include/RE/I/InteriorData.h similarity index 100% rename from CommonLibSF/include/RE/I/InteriorData.h rename to include/RE/I/InteriorData.h diff --git a/CommonLibSF/include/RE/I/idLogging.h b/include/RE/I/idLogging.h similarity index 100% rename from CommonLibSF/include/RE/I/idLogging.h rename to include/RE/I/idLogging.h diff --git a/CommonLibSF/include/RE/I/idTCP.h b/include/RE/I/idTCP.h similarity index 100% rename from CommonLibSF/include/RE/I/idTCP.h rename to include/RE/I/idTCP.h diff --git a/CommonLibSF/include/RE/IDs.h b/include/RE/IDs.h similarity index 100% rename from CommonLibSF/include/RE/IDs.h rename to include/RE/IDs.h diff --git a/CommonLibSF/include/RE/IDs_NiRTTI.h b/include/RE/IDs_NiRTTI.h similarity index 100% rename from CommonLibSF/include/RE/IDs_NiRTTI.h rename to include/RE/IDs_NiRTTI.h diff --git a/CommonLibSF/include/RE/IDs_RTTI.h b/include/RE/IDs_RTTI.h similarity index 100% rename from CommonLibSF/include/RE/IDs_RTTI.h rename to include/RE/IDs_RTTI.h diff --git a/CommonLibSF/include/RE/IDs_VTABLE.h b/include/RE/IDs_VTABLE.h similarity index 100% rename from CommonLibSF/include/RE/IDs_VTABLE.h rename to include/RE/IDs_VTABLE.h diff --git a/CommonLibSF/include/RE/L/Location.h b/include/RE/L/Location.h similarity index 100% rename from CommonLibSF/include/RE/L/Location.h rename to include/RE/L/Location.h diff --git a/CommonLibSF/include/RE/L/LockPickedEvent.h b/include/RE/L/LockPickedEvent.h similarity index 100% rename from CommonLibSF/include/RE/L/LockPickedEvent.h rename to include/RE/L/LockPickedEvent.h diff --git a/CommonLibSF/include/RE/L/Logger.h b/include/RE/L/Logger.h similarity index 100% rename from CommonLibSF/include/RE/L/Logger.h rename to include/RE/L/Logger.h diff --git a/CommonLibSF/include/RE/M/MagicItem.h b/include/RE/M/MagicItem.h similarity index 100% rename from CommonLibSF/include/RE/M/MagicItem.h rename to include/RE/M/MagicItem.h diff --git a/CommonLibSF/include/RE/M/MagicSystem.h b/include/RE/M/MagicSystem.h similarity index 100% rename from CommonLibSF/include/RE/M/MagicSystem.h rename to include/RE/M/MagicSystem.h diff --git a/CommonLibSF/include/RE/M/MagicTarget.h b/include/RE/M/MagicTarget.h similarity index 100% rename from CommonLibSF/include/RE/M/MagicTarget.h rename to include/RE/M/MagicTarget.h diff --git a/CommonLibSF/include/RE/M/Main.h b/include/RE/M/Main.h similarity index 77% rename from CommonLibSF/include/RE/M/Main.h rename to include/RE/M/Main.h index c84b4e6b..c1ff67c4 100644 --- a/CommonLibSF/include/RE/M/Main.h +++ b/include/RE/M/Main.h @@ -14,7 +14,7 @@ namespace RE NiAVObject* worldCameraRoot; //NiNode NiCamera* worldCamera; }; - static_assert(offsetof(SceneGraphRoot, SceneGraphRoot::worldCamera) == 0x80); + // static_assert(offsetof(SceneGraphRoot, SceneGraphRoot::worldCamera) == 0x80); // FIXME: clang-cl chokes on this assertion static SceneGraphRoot* WorldRoot() { diff --git a/CommonLibSF/include/RE/M/MemoryManager.h b/include/RE/M/MemoryManager.h similarity index 100% rename from CommonLibSF/include/RE/M/MemoryManager.h rename to include/RE/M/MemoryManager.h diff --git a/CommonLibSF/include/RE/M/MenuOpenCloseEvent.h b/include/RE/M/MenuOpenCloseEvent.h similarity index 100% rename from CommonLibSF/include/RE/M/MenuOpenCloseEvent.h rename to include/RE/M/MenuOpenCloseEvent.h diff --git a/CommonLibSF/include/RE/M/Misc.h b/include/RE/M/Misc.h similarity index 100% rename from CommonLibSF/include/RE/M/Misc.h rename to include/RE/M/Misc.h diff --git a/CommonLibSF/include/RE/M/MissileProjectile.h b/include/RE/M/MissileProjectile.h similarity index 100% rename from CommonLibSF/include/RE/M/MissileProjectile.h rename to include/RE/M/MissileProjectile.h diff --git a/CommonLibSF/include/RE/M/msvc.h b/include/RE/M/msvc.h similarity index 100% rename from CommonLibSF/include/RE/M/msvc.h rename to include/RE/M/msvc.h diff --git a/CommonLibSF/include/RE/N/NativeFunction.h b/include/RE/N/NativeFunction.h similarity index 100% rename from CommonLibSF/include/RE/N/NativeFunction.h rename to include/RE/N/NativeFunction.h diff --git a/CommonLibSF/include/RE/N/NativeFunctionBase.h b/include/RE/N/NativeFunctionBase.h similarity index 100% rename from CommonLibSF/include/RE/N/NativeFunctionBase.h rename to include/RE/N/NativeFunctionBase.h diff --git a/CommonLibSF/include/RE/N/NiAVObject.h b/include/RE/N/NiAVObject.h similarity index 100% rename from CommonLibSF/include/RE/N/NiAVObject.h rename to include/RE/N/NiAVObject.h diff --git a/CommonLibSF/include/RE/N/NiBound.h b/include/RE/N/NiBound.h similarity index 100% rename from CommonLibSF/include/RE/N/NiBound.h rename to include/RE/N/NiBound.h diff --git a/CommonLibSF/include/RE/N/NiCamera.h b/include/RE/N/NiCamera.h similarity index 96% rename from CommonLibSF/include/RE/N/NiCamera.h rename to include/RE/N/NiCamera.h index d4481e8f..cab648f8 100644 --- a/CommonLibSF/include/RE/N/NiCamera.h +++ b/include/RE/N/NiCamera.h @@ -87,5 +87,5 @@ namespace RE float lodAdjust; float unk2[24]; }; - static_assert(offsetof(NiCamera, NiCamera::worldToCam) == 384); + // static_assert(offsetof(NiCamera, NiCamera::worldToCam) == 384); // FIXME: clang-cl chokes on this assertion } diff --git a/CommonLibSF/include/RE/N/NiColor.h b/include/RE/N/NiColor.h similarity index 100% rename from CommonLibSF/include/RE/N/NiColor.h rename to include/RE/N/NiColor.h diff --git a/CommonLibSF/include/RE/N/NiMatrix3.h b/include/RE/N/NiMatrix3.h similarity index 100% rename from CommonLibSF/include/RE/N/NiMatrix3.h rename to include/RE/N/NiMatrix3.h diff --git a/CommonLibSF/include/RE/N/NiPoint2.h b/include/RE/N/NiPoint2.h similarity index 100% rename from CommonLibSF/include/RE/N/NiPoint2.h rename to include/RE/N/NiPoint2.h diff --git a/CommonLibSF/include/RE/N/NiPoint3.h b/include/RE/N/NiPoint3.h similarity index 100% rename from CommonLibSF/include/RE/N/NiPoint3.h rename to include/RE/N/NiPoint3.h diff --git a/CommonLibSF/include/RE/N/NiPoint4.h b/include/RE/N/NiPoint4.h similarity index 100% rename from CommonLibSF/include/RE/N/NiPoint4.h rename to include/RE/N/NiPoint4.h diff --git a/CommonLibSF/include/RE/N/NiQuaternion.h b/include/RE/N/NiQuaternion.h similarity index 100% rename from CommonLibSF/include/RE/N/NiQuaternion.h rename to include/RE/N/NiQuaternion.h diff --git a/CommonLibSF/include/RE/N/NiSmartPointer.h b/include/RE/N/NiSmartPointer.h similarity index 100% rename from CommonLibSF/include/RE/N/NiSmartPointer.h rename to include/RE/N/NiSmartPointer.h diff --git a/CommonLibSF/include/RE/N/NiTransform.h b/include/RE/N/NiTransform.h similarity index 100% rename from CommonLibSF/include/RE/N/NiTransform.h rename to include/RE/N/NiTransform.h diff --git a/CommonLibSF/include/RE/O/Object.h b/include/RE/O/Object.h similarity index 100% rename from CommonLibSF/include/RE/O/Object.h rename to include/RE/O/Object.h diff --git a/CommonLibSF/include/RE/O/ObjectBindPolicy.h b/include/RE/O/ObjectBindPolicy.h similarity index 100% rename from CommonLibSF/include/RE/O/ObjectBindPolicy.h rename to include/RE/O/ObjectBindPolicy.h diff --git a/CommonLibSF/include/RE/O/ObjectTypeInfo.h b/include/RE/O/ObjectTypeInfo.h similarity index 100% rename from CommonLibSF/include/RE/O/ObjectTypeInfo.h rename to include/RE/O/ObjectTypeInfo.h diff --git a/CommonLibSF/include/RE/P/PerkRankData.h b/include/RE/P/PerkRankData.h similarity index 100% rename from CommonLibSF/include/RE/P/PerkRankData.h rename to include/RE/P/PerkRankData.h diff --git a/CommonLibSF/include/RE/P/PlasmaProjectile.h b/include/RE/P/PlasmaProjectile.h similarity index 100% rename from CommonLibSF/include/RE/P/PlasmaProjectile.h rename to include/RE/P/PlasmaProjectile.h diff --git a/CommonLibSF/include/RE/P/PlayerCamera.h b/include/RE/P/PlayerCamera.h similarity index 100% rename from CommonLibSF/include/RE/P/PlayerCamera.h rename to include/RE/P/PlayerCamera.h diff --git a/CommonLibSF/include/RE/P/PlayerCharacter.h b/include/RE/P/PlayerCharacter.h similarity index 100% rename from CommonLibSF/include/RE/P/PlayerCharacter.h rename to include/RE/P/PlayerCharacter.h diff --git a/CommonLibSF/include/RE/P/Projectile.h b/include/RE/P/Projectile.h similarity index 100% rename from CommonLibSF/include/RE/P/Projectile.h rename to include/RE/P/Projectile.h diff --git a/CommonLibSF/include/RE/P/PropertyGroupInfo.h b/include/RE/P/PropertyGroupInfo.h similarity index 100% rename from CommonLibSF/include/RE/P/PropertyGroupInfo.h rename to include/RE/P/PropertyGroupInfo.h diff --git a/CommonLibSF/include/RE/P/PropertyTypeInfo.h b/include/RE/P/PropertyTypeInfo.h similarity index 100% rename from CommonLibSF/include/RE/P/PropertyTypeInfo.h rename to include/RE/P/PropertyTypeInfo.h diff --git a/CommonLibSF/include/RE/R/RawFuncCallQuery.h b/include/RE/R/RawFuncCallQuery.h similarity index 100% rename from CommonLibSF/include/RE/R/RawFuncCallQuery.h rename to include/RE/R/RawFuncCallQuery.h diff --git a/CommonLibSF/include/RE/R/RegSettingCollection.h b/include/RE/R/RegSettingCollection.h similarity index 100% rename from CommonLibSF/include/RE/R/RegSettingCollection.h rename to include/RE/R/RegSettingCollection.h diff --git a/CommonLibSF/include/RE/RTTI.h b/include/RE/RTTI.h similarity index 100% rename from CommonLibSF/include/RE/RTTI.h rename to include/RE/RTTI.h diff --git a/CommonLibSF/include/RE/S/SWFToCodeFunctionHandler.h b/include/RE/S/SWFToCodeFunctionHandler.h similarity index 100% rename from CommonLibSF/include/RE/S/SWFToCodeFunctionHandler.h rename to include/RE/S/SWFToCodeFunctionHandler.h diff --git a/CommonLibSF/include/RE/S/SavePatcher.h b/include/RE/S/SavePatcher.h similarity index 100% rename from CommonLibSF/include/RE/S/SavePatcher.h rename to include/RE/S/SavePatcher.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxASMovieRootBase.h b/include/RE/S/ScaleformGFxASMovieRootBase.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxASMovieRootBase.h rename to include/RE/S/ScaleformGFxASMovieRootBase.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxFileTypeConstants.h b/include/RE/S/ScaleformGFxFileTypeConstants.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxFileTypeConstants.h rename to include/RE/S/ScaleformGFxFileTypeConstants.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxFunctionHandler.h b/include/RE/S/ScaleformGFxFunctionHandler.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxFunctionHandler.h rename to include/RE/S/ScaleformGFxFunctionHandler.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxMovie.h b/include/RE/S/ScaleformGFxMovie.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxMovie.h rename to include/RE/S/ScaleformGFxMovie.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxState.h b/include/RE/S/ScaleformGFxState.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxState.h rename to include/RE/S/ScaleformGFxState.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxStateBag.h b/include/RE/S/ScaleformGFxStateBag.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxStateBag.h rename to include/RE/S/ScaleformGFxStateBag.h diff --git a/CommonLibSF/include/RE/S/ScaleformGFxValue.h b/include/RE/S/ScaleformGFxValue.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformGFxValue.h rename to include/RE/S/ScaleformGFxValue.h diff --git a/CommonLibSF/include/RE/S/ScaleformMemoryHeap.h b/include/RE/S/ScaleformMemoryHeap.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformMemoryHeap.h rename to include/RE/S/ScaleformMemoryHeap.h diff --git a/CommonLibSF/include/RE/S/ScaleformPtr.h b/include/RE/S/ScaleformPtr.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformPtr.h rename to include/RE/S/ScaleformPtr.h diff --git a/CommonLibSF/include/RE/S/ScaleformRefCount.h b/include/RE/S/ScaleformRefCount.h similarity index 100% rename from CommonLibSF/include/RE/S/ScaleformRefCount.h rename to include/RE/S/ScaleformRefCount.h diff --git a/CommonLibSF/include/RE/S/Script.h b/include/RE/S/Script.h similarity index 100% rename from CommonLibSF/include/RE/S/Script.h rename to include/RE/S/Script.h diff --git a/CommonLibSF/include/RE/S/Setting.h b/include/RE/S/Setting.h similarity index 100% rename from CommonLibSF/include/RE/S/Setting.h rename to include/RE/S/Setting.h diff --git a/CommonLibSF/include/RE/S/SettingCollection.h b/include/RE/S/SettingCollection.h similarity index 100% rename from CommonLibSF/include/RE/S/SettingCollection.h rename to include/RE/S/SettingCollection.h diff --git a/CommonLibSF/include/RE/S/SettingCollectionList.h b/include/RE/S/SettingCollectionList.h similarity index 100% rename from CommonLibSF/include/RE/S/SettingCollectionList.h rename to include/RE/S/SettingCollectionList.h diff --git a/CommonLibSF/include/RE/S/SettingCollectionMap.h b/include/RE/S/SettingCollectionMap.h similarity index 100% rename from CommonLibSF/include/RE/S/SettingCollectionMap.h rename to include/RE/S/SettingCollectionMap.h diff --git a/CommonLibSF/include/RE/S/Sexes.h b/include/RE/S/Sexes.h similarity index 100% rename from CommonLibSF/include/RE/S/Sexes.h rename to include/RE/S/Sexes.h diff --git a/CommonLibSF/include/RE/S/SpellItem.h b/include/RE/S/SpellItem.h similarity index 100% rename from CommonLibSF/include/RE/S/SpellItem.h rename to include/RE/S/SpellItem.h diff --git a/CommonLibSF/include/RE/S/Stack.h b/include/RE/S/Stack.h similarity index 100% rename from CommonLibSF/include/RE/S/Stack.h rename to include/RE/S/Stack.h diff --git a/CommonLibSF/include/RE/S/StackFrame.h b/include/RE/S/StackFrame.h similarity index 100% rename from CommonLibSF/include/RE/S/StackFrame.h rename to include/RE/S/StackFrame.h diff --git a/CommonLibSF/include/RE/S/Struct.h b/include/RE/S/Struct.h similarity index 100% rename from CommonLibSF/include/RE/S/Struct.h rename to include/RE/S/Struct.h diff --git a/CommonLibSF/include/RE/S/StructTypeInfo.h b/include/RE/S/StructTypeInfo.h similarity index 100% rename from CommonLibSF/include/RE/S/StructTypeInfo.h rename to include/RE/S/StructTypeInfo.h diff --git a/CommonLibSF/include/RE/Starfield.h b/include/RE/Starfield.h similarity index 100% rename from CommonLibSF/include/RE/Starfield.h rename to include/RE/Starfield.h diff --git a/CommonLibSF/include/RE/T/TBO_InstanceData.h b/include/RE/T/TBO_InstanceData.h similarity index 100% rename from CommonLibSF/include/RE/T/TBO_InstanceData.h rename to include/RE/T/TBO_InstanceData.h diff --git a/CommonLibSF/include/RE/T/TESAIForm.h b/include/RE/T/TESAIForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESAIForm.h rename to include/RE/T/TESAIForm.h diff --git a/CommonLibSF/include/RE/T/TESActorBase.h b/include/RE/T/TESActorBase.h similarity index 100% rename from CommonLibSF/include/RE/T/TESActorBase.h rename to include/RE/T/TESActorBase.h diff --git a/CommonLibSF/include/RE/T/TESActorBaseData.h b/include/RE/T/TESActorBaseData.h similarity index 100% rename from CommonLibSF/include/RE/T/TESActorBaseData.h rename to include/RE/T/TESActorBaseData.h diff --git a/CommonLibSF/include/RE/T/TESAmmo.h b/include/RE/T/TESAmmo.h similarity index 100% rename from CommonLibSF/include/RE/T/TESAmmo.h rename to include/RE/T/TESAmmo.h diff --git a/CommonLibSF/include/RE/T/TESBipedModelForm.h b/include/RE/T/TESBipedModelForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESBipedModelForm.h rename to include/RE/T/TESBipedModelForm.h diff --git a/CommonLibSF/include/RE/T/TESBoundAnimObject.h b/include/RE/T/TESBoundAnimObject.h similarity index 100% rename from CommonLibSF/include/RE/T/TESBoundAnimObject.h rename to include/RE/T/TESBoundAnimObject.h diff --git a/CommonLibSF/include/RE/T/TESBoundObject.h b/include/RE/T/TESBoundObject.h similarity index 100% rename from CommonLibSF/include/RE/T/TESBoundObject.h rename to include/RE/T/TESBoundObject.h diff --git a/CommonLibSF/include/RE/T/TESCamera.h b/include/RE/T/TESCamera.h similarity index 100% rename from CommonLibSF/include/RE/T/TESCamera.h rename to include/RE/T/TESCamera.h diff --git a/CommonLibSF/include/RE/T/TESCellFullyLoadedEvent.h b/include/RE/T/TESCellFullyLoadedEvent.h similarity index 100% rename from CommonLibSF/include/RE/T/TESCellFullyLoadedEvent.h rename to include/RE/T/TESCellFullyLoadedEvent.h diff --git a/CommonLibSF/include/RE/T/TESClass.h b/include/RE/T/TESClass.h similarity index 100% rename from CommonLibSF/include/RE/T/TESClass.h rename to include/RE/T/TESClass.h diff --git a/CommonLibSF/include/RE/T/TESClimate.h b/include/RE/T/TESClimate.h similarity index 100% rename from CommonLibSF/include/RE/T/TESClimate.h rename to include/RE/T/TESClimate.h diff --git a/CommonLibSF/include/RE/T/TESCombatStyle.h b/include/RE/T/TESCombatStyle.h similarity index 100% rename from CommonLibSF/include/RE/T/TESCombatStyle.h rename to include/RE/T/TESCombatStyle.h diff --git a/CommonLibSF/include/RE/T/TESCondition.h b/include/RE/T/TESCondition.h similarity index 100% rename from CommonLibSF/include/RE/T/TESCondition.h rename to include/RE/T/TESCondition.h diff --git a/CommonLibSF/include/RE/T/TESContainer.h b/include/RE/T/TESContainer.h similarity index 100% rename from CommonLibSF/include/RE/T/TESContainer.h rename to include/RE/T/TESContainer.h diff --git a/CommonLibSF/include/RE/T/TESContainerChangedEvent.h b/include/RE/T/TESContainerChangedEvent.h similarity index 100% rename from CommonLibSF/include/RE/T/TESContainerChangedEvent.h rename to include/RE/T/TESContainerChangedEvent.h diff --git a/CommonLibSF/include/RE/T/TESDataHandler.h b/include/RE/T/TESDataHandler.h similarity index 100% rename from CommonLibSF/include/RE/T/TESDataHandler.h rename to include/RE/T/TESDataHandler.h diff --git a/CommonLibSF/include/RE/T/TESDeathEvent.h b/include/RE/T/TESDeathEvent.h similarity index 100% rename from CommonLibSF/include/RE/T/TESDeathEvent.h rename to include/RE/T/TESDeathEvent.h diff --git a/CommonLibSF/include/RE/T/TESDescription.h b/include/RE/T/TESDescription.h similarity index 100% rename from CommonLibSF/include/RE/T/TESDescription.h rename to include/RE/T/TESDescription.h diff --git a/CommonLibSF/include/RE/T/TESEffectShader.h b/include/RE/T/TESEffectShader.h similarity index 100% rename from CommonLibSF/include/RE/T/TESEffectShader.h rename to include/RE/T/TESEffectShader.h diff --git a/CommonLibSF/include/RE/T/TESEnchantableForm.h b/include/RE/T/TESEnchantableForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESEnchantableForm.h rename to include/RE/T/TESEnchantableForm.h diff --git a/CommonLibSF/include/RE/T/TESEyes.h b/include/RE/T/TESEyes.h similarity index 100% rename from CommonLibSF/include/RE/T/TESEyes.h rename to include/RE/T/TESEyes.h diff --git a/CommonLibSF/include/RE/T/TESFaction.h b/include/RE/T/TESFaction.h similarity index 100% rename from CommonLibSF/include/RE/T/TESFaction.h rename to include/RE/T/TESFaction.h diff --git a/CommonLibSF/include/RE/T/TESFile.h b/include/RE/T/TESFile.h similarity index 100% rename from CommonLibSF/include/RE/T/TESFile.h rename to include/RE/T/TESFile.h diff --git a/CommonLibSF/include/RE/T/TESFlora.h b/include/RE/T/TESFlora.h similarity index 100% rename from CommonLibSF/include/RE/T/TESFlora.h rename to include/RE/T/TESFlora.h diff --git a/CommonLibSF/include/RE/T/TESForm.h b/include/RE/T/TESForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESForm.h rename to include/RE/T/TESForm.h diff --git a/CommonLibSF/include/RE/T/TESFormRefCount.h b/include/RE/T/TESFormRefCount.h similarity index 100% rename from CommonLibSF/include/RE/T/TESFormRefCount.h rename to include/RE/T/TESFormRefCount.h diff --git a/CommonLibSF/include/RE/T/TESFullName.h b/include/RE/T/TESFullName.h similarity index 100% rename from CommonLibSF/include/RE/T/TESFullName.h rename to include/RE/T/TESFullName.h diff --git a/CommonLibSF/include/RE/T/TESFurniture.h b/include/RE/T/TESFurniture.h similarity index 100% rename from CommonLibSF/include/RE/T/TESFurniture.h rename to include/RE/T/TESFurniture.h diff --git a/CommonLibSF/include/RE/T/TESGlobal.h b/include/RE/T/TESGlobal.h similarity index 100% rename from CommonLibSF/include/RE/T/TESGlobal.h rename to include/RE/T/TESGlobal.h diff --git a/CommonLibSF/include/RE/T/TESGrass.h b/include/RE/T/TESGrass.h similarity index 100% rename from CommonLibSF/include/RE/T/TESGrass.h rename to include/RE/T/TESGrass.h diff --git a/CommonLibSF/include/RE/T/TESHandleForm.h b/include/RE/T/TESHandleForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESHandleForm.h rename to include/RE/T/TESHandleForm.h diff --git a/CommonLibSF/include/RE/T/TESIdleForm.h b/include/RE/T/TESIdleForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESIdleForm.h rename to include/RE/T/TESIdleForm.h diff --git a/CommonLibSF/include/RE/T/TESImageSpace.h b/include/RE/T/TESImageSpace.h similarity index 100% rename from CommonLibSF/include/RE/T/TESImageSpace.h rename to include/RE/T/TESImageSpace.h diff --git a/CommonLibSF/include/RE/T/TESImageSpaceModifiableForm.h b/include/RE/T/TESImageSpaceModifiableForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESImageSpaceModifiableForm.h rename to include/RE/T/TESImageSpaceModifiableForm.h diff --git a/CommonLibSF/include/RE/T/TESKey.h b/include/RE/T/TESKey.h similarity index 100% rename from CommonLibSF/include/RE/T/TESKey.h rename to include/RE/T/TESKey.h diff --git a/CommonLibSF/include/RE/T/TESLandTexture.h b/include/RE/T/TESLandTexture.h similarity index 100% rename from CommonLibSF/include/RE/T/TESLandTexture.h rename to include/RE/T/TESLandTexture.h diff --git a/CommonLibSF/include/RE/T/TESLevCharacter.h b/include/RE/T/TESLevCharacter.h similarity index 100% rename from CommonLibSF/include/RE/T/TESLevCharacter.h rename to include/RE/T/TESLevCharacter.h diff --git a/CommonLibSF/include/RE/T/TESLevItem.h b/include/RE/T/TESLevItem.h similarity index 100% rename from CommonLibSF/include/RE/T/TESLevItem.h rename to include/RE/T/TESLevItem.h diff --git a/CommonLibSF/include/RE/T/TESLevSpell.h b/include/RE/T/TESLevSpell.h similarity index 100% rename from CommonLibSF/include/RE/T/TESLevSpell.h rename to include/RE/T/TESLevSpell.h diff --git a/CommonLibSF/include/RE/T/TESLeveledList.h b/include/RE/T/TESLeveledList.h similarity index 100% rename from CommonLibSF/include/RE/T/TESLeveledList.h rename to include/RE/T/TESLeveledList.h diff --git a/CommonLibSF/include/RE/T/TESLoadScreen.h b/include/RE/T/TESLoadScreen.h similarity index 100% rename from CommonLibSF/include/RE/T/TESLoadScreen.h rename to include/RE/T/TESLoadScreen.h diff --git a/CommonLibSF/include/RE/T/TESMagicTargetForm.h b/include/RE/T/TESMagicTargetForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESMagicTargetForm.h rename to include/RE/T/TESMagicTargetForm.h diff --git a/CommonLibSF/include/RE/T/TESModel.h b/include/RE/T/TESModel.h similarity index 100% rename from CommonLibSF/include/RE/T/TESModel.h rename to include/RE/T/TESModel.h diff --git a/CommonLibSF/include/RE/T/TESModelTri.h b/include/RE/T/TESModelTri.h similarity index 100% rename from CommonLibSF/include/RE/T/TESModelTri.h rename to include/RE/T/TESModelTri.h diff --git a/CommonLibSF/include/RE/T/TESNPC.h b/include/RE/T/TESNPC.h similarity index 100% rename from CommonLibSF/include/RE/T/TESNPC.h rename to include/RE/T/TESNPC.h diff --git a/CommonLibSF/include/RE/T/TESObject.h b/include/RE/T/TESObject.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObject.h rename to include/RE/T/TESObject.h diff --git a/CommonLibSF/include/RE/T/TESObjectACTI.h b/include/RE/T/TESObjectACTI.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectACTI.h rename to include/RE/T/TESObjectACTI.h diff --git a/CommonLibSF/include/RE/T/TESObjectANIO.h b/include/RE/T/TESObjectANIO.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectANIO.h rename to include/RE/T/TESObjectANIO.h diff --git a/CommonLibSF/include/RE/T/TESObjectARMA.h b/include/RE/T/TESObjectARMA.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectARMA.h rename to include/RE/T/TESObjectARMA.h diff --git a/CommonLibSF/include/RE/T/TESObjectARMO.h b/include/RE/T/TESObjectARMO.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectARMO.h rename to include/RE/T/TESObjectARMO.h diff --git a/CommonLibSF/include/RE/T/TESObjectBOOK.h b/include/RE/T/TESObjectBOOK.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectBOOK.h rename to include/RE/T/TESObjectBOOK.h diff --git a/CommonLibSF/include/RE/T/TESObjectCELL.h b/include/RE/T/TESObjectCELL.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectCELL.h rename to include/RE/T/TESObjectCELL.h diff --git a/CommonLibSF/include/RE/T/TESObjectCONT.h b/include/RE/T/TESObjectCONT.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectCONT.h rename to include/RE/T/TESObjectCONT.h diff --git a/CommonLibSF/include/RE/T/TESObjectDOOR.h b/include/RE/T/TESObjectDOOR.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectDOOR.h rename to include/RE/T/TESObjectDOOR.h diff --git a/CommonLibSF/include/RE/T/TESObjectLIGH.h b/include/RE/T/TESObjectLIGH.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectLIGH.h rename to include/RE/T/TESObjectLIGH.h diff --git a/CommonLibSF/include/RE/T/TESObjectLoadedEvent.h b/include/RE/T/TESObjectLoadedEvent.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectLoadedEvent.h rename to include/RE/T/TESObjectLoadedEvent.h diff --git a/CommonLibSF/include/RE/T/TESObjectMISC.h b/include/RE/T/TESObjectMISC.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectMISC.h rename to include/RE/T/TESObjectMISC.h diff --git a/CommonLibSF/include/RE/T/TESObjectREFR.h b/include/RE/T/TESObjectREFR.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectREFR.h rename to include/RE/T/TESObjectREFR.h diff --git a/CommonLibSF/include/RE/T/TESObjectSTAT.h b/include/RE/T/TESObjectSTAT.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectSTAT.h rename to include/RE/T/TESObjectSTAT.h diff --git a/CommonLibSF/include/RE/T/TESObjectWEAP.h b/include/RE/T/TESObjectWEAP.h similarity index 100% rename from CommonLibSF/include/RE/T/TESObjectWEAP.h rename to include/RE/T/TESObjectWEAP.h diff --git a/CommonLibSF/include/RE/T/TESPackage.h b/include/RE/T/TESPackage.h similarity index 100% rename from CommonLibSF/include/RE/T/TESPackage.h rename to include/RE/T/TESPackage.h diff --git a/CommonLibSF/include/RE/T/TESProduceForm.h b/include/RE/T/TESProduceForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESProduceForm.h rename to include/RE/T/TESProduceForm.h diff --git a/CommonLibSF/include/RE/T/TESQuest.h b/include/RE/T/TESQuest.h similarity index 100% rename from CommonLibSF/include/RE/T/TESQuest.h rename to include/RE/T/TESQuest.h diff --git a/CommonLibSF/include/RE/T/TESRace.h b/include/RE/T/TESRace.h similarity index 99% rename from CommonLibSF/include/RE/T/TESRace.h rename to include/RE/T/TESRace.h index d30f56cc..fd54c6b0 100644 --- a/CommonLibSF/include/RE/T/TESRace.h +++ b/include/RE/T/TESRace.h @@ -16,7 +16,7 @@ #include "RE/T/TESForm.h" #include "RE/T/TESFullName.h" #include "RE/T/TESSpellList.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/T/TESRaceForm.h b/include/RE/T/TESRaceForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESRaceForm.h rename to include/RE/T/TESRaceForm.h diff --git a/CommonLibSF/include/RE/T/TESRegion.h b/include/RE/T/TESRegion.h similarity index 100% rename from CommonLibSF/include/RE/T/TESRegion.h rename to include/RE/T/TESRegion.h diff --git a/CommonLibSF/include/RE/T/TESResponse.h b/include/RE/T/TESResponse.h similarity index 100% rename from CommonLibSF/include/RE/T/TESResponse.h rename to include/RE/T/TESResponse.h diff --git a/CommonLibSF/include/RE/T/TESSound.h b/include/RE/T/TESSound.h similarity index 93% rename from CommonLibSF/include/RE/T/TESSound.h rename to include/RE/T/TESSound.h index 469d9c25..e21e4a59 100644 --- a/CommonLibSF/include/RE/T/TESSound.h +++ b/include/RE/T/TESSound.h @@ -2,7 +2,7 @@ #include "RE/B/BGSKeywordForm.h" #include "RE/T/TESBoundAnimObject.h" -#include "RE/W/WWiseSoundHook.h" +#include "RE/W/WwiseSoundHook.h" namespace RE { diff --git a/CommonLibSF/include/RE/T/TESSpellList.h b/include/RE/T/TESSpellList.h similarity index 100% rename from CommonLibSF/include/RE/T/TESSpellList.h rename to include/RE/T/TESSpellList.h diff --git a/CommonLibSF/include/RE/T/TESTexture.h b/include/RE/T/TESTexture.h similarity index 100% rename from CommonLibSF/include/RE/T/TESTexture.h rename to include/RE/T/TESTexture.h diff --git a/CommonLibSF/include/RE/T/TESTopicInfo.h b/include/RE/T/TESTopicInfo.h similarity index 100% rename from CommonLibSF/include/RE/T/TESTopicInfo.h rename to include/RE/T/TESTopicInfo.h diff --git a/CommonLibSF/include/RE/T/TESValueForm.h b/include/RE/T/TESValueForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESValueForm.h rename to include/RE/T/TESValueForm.h diff --git a/CommonLibSF/include/RE/T/TESWaterForm.h b/include/RE/T/TESWaterForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESWaterForm.h rename to include/RE/T/TESWaterForm.h diff --git a/CommonLibSF/include/RE/T/TESWeather.h b/include/RE/T/TESWeather.h similarity index 100% rename from CommonLibSF/include/RE/T/TESWeather.h rename to include/RE/T/TESWeather.h diff --git a/CommonLibSF/include/RE/T/TESWeightForm.h b/include/RE/T/TESWeightForm.h similarity index 100% rename from CommonLibSF/include/RE/T/TESWeightForm.h rename to include/RE/T/TESWeightForm.h diff --git a/CommonLibSF/include/RE/T/TESWorldSpace.h b/include/RE/T/TESWorldSpace.h similarity index 100% rename from CommonLibSF/include/RE/T/TESWorldSpace.h rename to include/RE/T/TESWorldSpace.h diff --git a/CommonLibSF/include/RE/T/TypeInfo.h b/include/RE/T/TypeInfo.h similarity index 100% rename from CommonLibSF/include/RE/T/TypeInfo.h rename to include/RE/T/TypeInfo.h diff --git a/CommonLibSF/include/RE/U/UI.h b/include/RE/U/UI.h similarity index 98% rename from CommonLibSF/include/RE/U/UI.h rename to include/RE/U/UI.h index ed830efb..67fbad5c 100644 --- a/CommonLibSF/include/RE/U/UI.h +++ b/include/RE/U/UI.h @@ -8,6 +8,8 @@ namespace RE { class IMenu; + class MenuOpenCloseEvent; + class MenuModeChangeEvent; namespace Scaleform { @@ -22,8 +24,6 @@ namespace RE struct MenuPauseChangeEvent; struct MenuPauseCounterChangeEvent; struct TutorialEvent; - struct MenuOpenCloseEvent; - struct MenuModeChangeEvent; class UI : //public BSTSingletonSDM, diff --git a/CommonLibSF/include/RE/U/UIMessageQueue.h b/include/RE/U/UIMessageQueue.h similarity index 100% rename from CommonLibSF/include/RE/U/UIMessageQueue.h rename to include/RE/U/UIMessageQueue.h diff --git a/CommonLibSF/include/RE/V/Variable.h b/include/RE/V/Variable.h similarity index 100% rename from CommonLibSF/include/RE/V/Variable.h rename to include/RE/V/Variable.h diff --git a/CommonLibSF/include/RE/W/WwiseGUID.h b/include/RE/W/WwiseGUID.h similarity index 100% rename from CommonLibSF/include/RE/W/WwiseGUID.h rename to include/RE/W/WwiseGUID.h diff --git a/CommonLibSF/include/RE/W/WwiseSoundHook.h b/include/RE/W/WwiseSoundHook.h similarity index 100% rename from CommonLibSF/include/RE/W/WwiseSoundHook.h rename to include/RE/W/WwiseSoundHook.h diff --git a/CommonLibSF/include/REL/ID.h b/include/REL/ID.h similarity index 100% rename from CommonLibSF/include/REL/ID.h rename to include/REL/ID.h diff --git a/CommonLibSF/include/REL/Module.h b/include/REL/Module.h similarity index 100% rename from CommonLibSF/include/REL/Module.h rename to include/REL/Module.h diff --git a/CommonLibSF/include/REL/Offset.h b/include/REL/Offset.h similarity index 100% rename from CommonLibSF/include/REL/Offset.h rename to include/REL/Offset.h diff --git a/CommonLibSF/include/REL/Pattern.h b/include/REL/Pattern.h similarity index 100% rename from CommonLibSF/include/REL/Pattern.h rename to include/REL/Pattern.h diff --git a/CommonLibSF/include/REL/REL.h b/include/REL/REL.h similarity index 100% rename from CommonLibSF/include/REL/REL.h rename to include/REL/REL.h diff --git a/CommonLibSF/include/REL/Relocation.h b/include/REL/Relocation.h similarity index 100% rename from CommonLibSF/include/REL/Relocation.h rename to include/REL/Relocation.h diff --git a/CommonLibSF/include/REL/Version.h b/include/REL/Version.h similarity index 100% rename from CommonLibSF/include/REL/Version.h rename to include/REL/Version.h diff --git a/CommonLibSF/include/SFSE/API.h b/include/SFSE/API.h similarity index 100% rename from CommonLibSF/include/SFSE/API.h rename to include/SFSE/API.h diff --git a/CommonLibSF/include/SFSE/IAT.h b/include/SFSE/IAT.h similarity index 100% rename from CommonLibSF/include/SFSE/IAT.h rename to include/SFSE/IAT.h diff --git a/CommonLibSF/include/SFSE/Impl/DInputAPI.h b/include/SFSE/Impl/DInputAPI.h similarity index 100% rename from CommonLibSF/include/SFSE/Impl/DInputAPI.h rename to include/SFSE/Impl/DInputAPI.h diff --git a/CommonLibSF/include/SFSE/Impl/PCH.h b/include/SFSE/Impl/PCH.h similarity index 100% rename from CommonLibSF/include/SFSE/Impl/PCH.h rename to include/SFSE/Impl/PCH.h diff --git a/CommonLibSF/include/SFSE/Impl/Stubs.h b/include/SFSE/Impl/Stubs.h similarity index 100% rename from CommonLibSF/include/SFSE/Impl/Stubs.h rename to include/SFSE/Impl/Stubs.h diff --git a/CommonLibSF/include/SFSE/Impl/WinAPI.h b/include/SFSE/Impl/WinAPI.h similarity index 100% rename from CommonLibSF/include/SFSE/Impl/WinAPI.h rename to include/SFSE/Impl/WinAPI.h diff --git a/CommonLibSF/include/SFSE/Impl/XInputAPI.h b/include/SFSE/Impl/XInputAPI.h similarity index 100% rename from CommonLibSF/include/SFSE/Impl/XInputAPI.h rename to include/SFSE/Impl/XInputAPI.h diff --git a/CommonLibSF/include/SFSE/InputMap.h b/include/SFSE/InputMap.h similarity index 100% rename from CommonLibSF/include/SFSE/InputMap.h rename to include/SFSE/InputMap.h diff --git a/CommonLibSF/include/SFSE/Interfaces.h b/include/SFSE/Interfaces.h similarity index 100% rename from CommonLibSF/include/SFSE/Interfaces.h rename to include/SFSE/Interfaces.h diff --git a/CommonLibSF/include/SFSE/Logger.h b/include/SFSE/Logger.h similarity index 100% rename from CommonLibSF/include/SFSE/Logger.h rename to include/SFSE/Logger.h diff --git a/CommonLibSF/include/SFSE/SFSE.h b/include/SFSE/SFSE.h similarity index 100% rename from CommonLibSF/include/SFSE/SFSE.h rename to include/SFSE/SFSE.h diff --git a/CommonLibSF/include/SFSE/Trampoline.h b/include/SFSE/Trampoline.h similarity index 100% rename from CommonLibSF/include/SFSE/Trampoline.h rename to include/SFSE/Trampoline.h diff --git a/CommonLibSF/include/SFSE/Utilities.h b/include/SFSE/Utilities.h similarity index 100% rename from CommonLibSF/include/SFSE/Utilities.h rename to include/SFSE/Utilities.h diff --git a/CommonLibSF/include/SFSE/Version.h b/include/SFSE/Version.h similarity index 100% rename from CommonLibSF/include/SFSE/Version.h rename to include/SFSE/Version.h diff --git a/scripts/add-file.ps1 b/scripts/add-file.ps1 index f328d9e3..1e9a0fa2 100644 --- a/scripts/add-file.ps1 +++ b/scripts/add-file.ps1 @@ -22,8 +22,8 @@ use ctrl ^ c to exit $workspace = Resolve-Path "$PSScriptRoot/../" Push-Location $workspace -$include = "$workspace/CommonLibSF/include/RE" -$src = "$workspace/CommonLibSF/src/RE" +$include = "$workspace/include/RE" +$src = "$workspace/src/RE" function Modify-File { @@ -72,9 +72,9 @@ while ($true) { } 'r' { # refresh - & "$workspace/.github/make-directives.ps1" "$workspace/CommonLibSF" + & "$workspace/.github/make-directives.ps1" "$workspace" - $cmake = "$workspace/CommonLibSF/CMakeLists.txt" + $cmake = "$workspace/CMakeLists.txt" [IO.File]::WriteAllText($cmake, [IO.File]::ReadAllText($cmake)) break } diff --git a/scripts/build-debug-clang-cl-test.bat b/scripts/build-debug-clang-cl-test.bat index 375042a1..3cbc5d16 100644 --- a/scripts/build-debug-clang-cl-test.bat +++ b/scripts/build-debug-clang-cl-test.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-ninja -DSFSE_BUILD_TESTS=true +cmake -B "%~dp0/../build/build-debug-clang-cl-ninja-test" -S "%~dp0/.." --preset=build-debug-clang-cl-ninja -DSFSE_BUILD_TESTS=true cmake --build "%~dp0/../build/build-debug-clang-cl-ninja-test" --config Debug diff --git a/scripts/build-debug-clang-cl.bat b/scripts/build-debug-clang-cl.bat index 97f69e4c..e786d70d 100644 --- a/scripts/build-debug-clang-cl.bat +++ b/scripts/build-debug-clang-cl.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-ninja" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-ninja +cmake -B "%~dp0/../build/build-debug-clang-cl-ninja" -S "%~dp0/.." --preset=build-debug-clang-cl-ninja cmake --build "%~dp0/../build/build-debug-clang-cl-ninja" --config Debug diff --git a/scripts/build-debug-msvc-test.bat b/scripts/build-debug-msvc-test.bat index ca84e489..4195c248 100644 --- a/scripts/build-debug-msvc-test.bat +++ b/scripts/build-debug-msvc-test.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-debug-msvc-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja -DSFSE_BUILD_TESTS=true +cmake -B "%~dp0/../build/build-debug-msvc-ninja-test" -S "%~dp0/.." --preset=build-debug-msvc-ninja -DSFSE_BUILD_TESTS=true cmake --build "%~dp0/../build/build-debug-msvc-ninja-test" --config Debug diff --git a/scripts/build-debug-msvc.bat b/scripts/build-debug-msvc.bat index 4d1447ed..ec141d9b 100644 --- a/scripts/build-debug-msvc.bat +++ b/scripts/build-debug-msvc.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-debug-msvc-ninja" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja +cmake -B "%~dp0/../build/build-debug-msvc-ninja" -S "%~dp0/.." --preset=build-debug-msvc-ninja cmake --build "%~dp0/../build/build-debug-msvc-ninja" --config Debug diff --git a/scripts/build-release-clang-cl-test.bat b/scripts/build-release-clang-cl-test.bat index d9c83782..29098846 100644 --- a/scripts/build-release-clang-cl-test.bat +++ b/scripts/build-release-clang-cl-test.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-release-clang-cl-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja -DSFSE_BUILD_TESTS=true +cmake -B "%~dp0/../build/build-release-clang-cl-ninja-test" -S "%~dp0/.." --preset=build-release-clang-cl-ninja -DSFSE_BUILD_TESTS=true cmake --build "%~dp0/../build/build-release-clang-cl-ninja-test" --config Release diff --git a/scripts/build-release-clang-cl.bat b/scripts/build-release-clang-cl.bat index 7db5a0d9..4d784e3c 100644 --- a/scripts/build-release-clang-cl.bat +++ b/scripts/build-release-clang-cl.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-release-clang-cl-ninja" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja +cmake -B "%~dp0/../build/build-release-clang-cl-ninja" -S "%~dp0/.." --preset=build-release-clang-cl-ninja cmake --build "%~dp0/../build/build-release-clang-cl-ninja" --config Release diff --git a/scripts/build-release-msvc-test.bat b/scripts/build-release-msvc-test.bat index 51d65d84..756976c9 100644 --- a/scripts/build-release-msvc-test.bat +++ b/scripts/build-release-msvc-test.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-release-msvc-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja -DSFSE_BUILD_TESTS=true +cmake -B "%~dp0/../build/build-release-msvc-ninja-test" -S "%~dp0/.." --preset=build-release-msvc-ninja -DSFSE_BUILD_TESTS=true cmake --build "%~dp0/../build/build-release-msvc-ninja-test" --config Release diff --git a/scripts/build-release-msvc.bat b/scripts/build-release-msvc.bat index 523710ca..97faf5ac 100644 --- a/scripts/build-release-msvc.bat +++ b/scripts/build-release-msvc.bat @@ -1,3 +1,3 @@ echo off -cmake -B "%~dp0/../build/build-release-msvc-ninja" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja +cmake -B "%~dp0/../build/build-release-msvc-ninja" -S "%~dp0/.." --preset=build-release-msvc-ninja cmake --build "%~dp0/../build/build-release-msvc-ninja" --config Release diff --git a/scripts/make-sln-clang-cl.bat b/scripts/make-sln-clang-cl.bat index 87b5bb2b..b6c97722 100644 --- a/scripts/make-sln-clang-cl.bat +++ b/scripts/make-sln-clang-cl.bat @@ -1,2 +1,2 @@ echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-msvc" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-msvc +cmake -B "%~dp0/../build/build-debug-clang-cl-msvc" -S "%~dp0/.." --preset=build-debug-clang-cl-msvc diff --git a/scripts/make-sln-msvc.bat b/scripts/make-sln-msvc.bat index 438de253..8295aaf2 100644 --- a/scripts/make-sln-msvc.bat +++ b/scripts/make-sln-msvc.bat @@ -1,2 +1,2 @@ echo off -cmake -B "%~dp0/../build/build-debug-msvc-msvc" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-msvc +cmake -B "%~dp0/../build/build-debug-msvc-msvc" -S "%~dp0/.." --preset=build-debug-msvc-msvc diff --git a/CommonLibSF/src/RE/A/Actor.cpp b/src/RE/A/Actor.cpp similarity index 100% rename from CommonLibSF/src/RE/A/Actor.cpp rename to src/RE/A/Actor.cpp diff --git a/CommonLibSF/src/RE/A/ActorEquipManager.cpp b/src/RE/A/ActorEquipManager.cpp similarity index 100% rename from CommonLibSF/src/RE/A/ActorEquipManager.cpp rename to src/RE/A/ActorEquipManager.cpp diff --git a/CommonLibSF/src/RE/A/Array.cpp b/src/RE/A/Array.cpp similarity index 100% rename from CommonLibSF/src/RE/A/Array.cpp rename to src/RE/A/Array.cpp diff --git a/CommonLibSF/src/RE/B/BGSKeywordForm.cpp b/src/RE/B/BGSKeywordForm.cpp similarity index 100% rename from CommonLibSF/src/RE/B/BGSKeywordForm.cpp rename to src/RE/B/BGSKeywordForm.cpp diff --git a/CommonLibSF/src/RE/B/BSLock.cpp b/src/RE/B/BSLock.cpp similarity index 100% rename from CommonLibSF/src/RE/B/BSLock.cpp rename to src/RE/B/BSLock.cpp diff --git a/CommonLibSF/src/RE/B/BSLog.cpp b/src/RE/B/BSLog.cpp similarity index 100% rename from CommonLibSF/src/RE/B/BSLog.cpp rename to src/RE/B/BSLog.cpp diff --git a/CommonLibSF/src/RE/B/BSSystemFile.cpp b/src/RE/B/BSSystemFile.cpp similarity index 100% rename from CommonLibSF/src/RE/B/BSSystemFile.cpp rename to src/RE/B/BSSystemFile.cpp diff --git a/CommonLibSF/src/RE/C/Color.cpp b/src/RE/C/Color.cpp similarity index 100% rename from CommonLibSF/src/RE/C/Color.cpp rename to src/RE/C/Color.cpp diff --git a/CommonLibSF/src/RE/E/ExtraLock.cpp b/src/RE/E/ExtraLock.cpp similarity index 100% rename from CommonLibSF/src/RE/E/ExtraLock.cpp rename to src/RE/E/ExtraLock.cpp diff --git a/CommonLibSF/src/RE/F/FormTypes.cpp b/src/RE/F/FormTypes.cpp similarity index 100% rename from CommonLibSF/src/RE/F/FormTypes.cpp rename to src/RE/F/FormTypes.cpp diff --git a/CommonLibSF/src/RE/I/idLogging.cpp b/src/RE/I/idLogging.cpp similarity index 100% rename from CommonLibSF/src/RE/I/idLogging.cpp rename to src/RE/I/idLogging.cpp diff --git a/CommonLibSF/src/RE/I/idTCP.cpp b/src/RE/I/idTCP.cpp similarity index 100% rename from CommonLibSF/src/RE/I/idTCP.cpp rename to src/RE/I/idTCP.cpp diff --git a/CommonLibSF/src/RE/M/Misc.cpp b/src/RE/M/Misc.cpp similarity index 100% rename from CommonLibSF/src/RE/M/Misc.cpp rename to src/RE/M/Misc.cpp diff --git a/CommonLibSF/src/RE/N/NiPoint3.cpp b/src/RE/N/NiPoint3.cpp similarity index 100% rename from CommonLibSF/src/RE/N/NiPoint3.cpp rename to src/RE/N/NiPoint3.cpp diff --git a/CommonLibSF/src/RE/P/PlayerCamera.cpp b/src/RE/P/PlayerCamera.cpp similarity index 100% rename from CommonLibSF/src/RE/P/PlayerCamera.cpp rename to src/RE/P/PlayerCamera.cpp diff --git a/CommonLibSF/src/RE/P/PlayerCharacter.cpp b/src/RE/P/PlayerCharacter.cpp similarity index 100% rename from CommonLibSF/src/RE/P/PlayerCharacter.cpp rename to src/RE/P/PlayerCharacter.cpp diff --git a/CommonLibSF/src/RE/S/StackFrame.cpp b/src/RE/S/StackFrame.cpp similarity index 100% rename from CommonLibSF/src/RE/S/StackFrame.cpp rename to src/RE/S/StackFrame.cpp diff --git a/CommonLibSF/src/RE/S/Struct.cpp b/src/RE/S/Struct.cpp similarity index 100% rename from CommonLibSF/src/RE/S/Struct.cpp rename to src/RE/S/Struct.cpp diff --git a/CommonLibSF/src/RE/T/TESFormRefCount.cpp b/src/RE/T/TESFormRefCount.cpp similarity index 100% rename from CommonLibSF/src/RE/T/TESFormRefCount.cpp rename to src/RE/T/TESFormRefCount.cpp diff --git a/CommonLibSF/src/RE/T/TESNPC.cpp b/src/RE/T/TESNPC.cpp similarity index 100% rename from CommonLibSF/src/RE/T/TESNPC.cpp rename to src/RE/T/TESNPC.cpp diff --git a/CommonLibSF/src/RE/T/TESObjectCELL.cpp b/src/RE/T/TESObjectCELL.cpp similarity index 100% rename from CommonLibSF/src/RE/T/TESObjectCELL.cpp rename to src/RE/T/TESObjectCELL.cpp diff --git a/CommonLibSF/src/RE/T/TESObjectREFR.cpp b/src/RE/T/TESObjectREFR.cpp similarity index 100% rename from CommonLibSF/src/RE/T/TESObjectREFR.cpp rename to src/RE/T/TESObjectREFR.cpp diff --git a/CommonLibSF/src/RE/T/TESWorldSpace.cpp b/src/RE/T/TESWorldSpace.cpp similarity index 100% rename from CommonLibSF/src/RE/T/TESWorldSpace.cpp rename to src/RE/T/TESWorldSpace.cpp diff --git a/CommonLibSF/src/RE/T/TypeInfo.cpp b/src/RE/T/TypeInfo.cpp similarity index 100% rename from CommonLibSF/src/RE/T/TypeInfo.cpp rename to src/RE/T/TypeInfo.cpp diff --git a/CommonLibSF/src/RE/V/Variable.cpp b/src/RE/V/Variable.cpp similarity index 100% rename from CommonLibSF/src/RE/V/Variable.cpp rename to src/RE/V/Variable.cpp diff --git a/CommonLibSF/src/REL/ID.cpp b/src/REL/ID.cpp similarity index 100% rename from CommonLibSF/src/REL/ID.cpp rename to src/REL/ID.cpp diff --git a/CommonLibSF/src/SFSE/API.cpp b/src/SFSE/API.cpp similarity index 100% rename from CommonLibSF/src/SFSE/API.cpp rename to src/SFSE/API.cpp diff --git a/CommonLibSF/src/SFSE/IAT.cpp b/src/SFSE/IAT.cpp similarity index 100% rename from CommonLibSF/src/SFSE/IAT.cpp rename to src/SFSE/IAT.cpp diff --git a/CommonLibSF/src/SFSE/Impl/WinAPI.cpp b/src/SFSE/Impl/WinAPI.cpp similarity index 100% rename from CommonLibSF/src/SFSE/Impl/WinAPI.cpp rename to src/SFSE/Impl/WinAPI.cpp diff --git a/CommonLibSF/src/SFSE/InputMap.cpp b/src/SFSE/InputMap.cpp similarity index 100% rename from CommonLibSF/src/SFSE/InputMap.cpp rename to src/SFSE/InputMap.cpp diff --git a/CommonLibSF/src/SFSE/Interfaces.cpp b/src/SFSE/Interfaces.cpp similarity index 100% rename from CommonLibSF/src/SFSE/Interfaces.cpp rename to src/SFSE/Interfaces.cpp diff --git a/CommonLibSF/src/SFSE/Logger.cpp b/src/SFSE/Logger.cpp similarity index 100% rename from CommonLibSF/src/SFSE/Logger.cpp rename to src/SFSE/Logger.cpp diff --git a/CommonLibSF/src/SFSE/Trampoline.cpp b/src/SFSE/Trampoline.cpp similarity index 100% rename from CommonLibSF/src/SFSE/Trampoline.cpp rename to src/SFSE/Trampoline.cpp diff --git a/CommonLibSF/test/test.cpp b/test/test.cpp similarity index 100% rename from CommonLibSF/test/test.cpp rename to test/test.cpp diff --git a/CommonLibSF/vcpkg.json b/vcpkg.json similarity index 100% rename from CommonLibSF/vcpkg.json rename to vcpkg.json diff --git a/CommonLibSF/xmake-extra.lua b/xmake-extra.lua similarity index 100% rename from CommonLibSF/xmake-extra.lua rename to xmake-extra.lua diff --git a/xmake.lua b/xmake.lua index d70300bb..1f6d4eaf 100644 --- a/xmake.lua +++ b/xmake.lua @@ -15,5 +15,104 @@ add_rules("mode.debug", "mode.release") add_requires("xbyak") add_requires("spdlog", { configs = { header_only = false, std_format = true } }) --- include subprojects -includes("CommonLibSF") +-- make extras available +includes("xmake-extra.lua") + +-- define options +option("sfse_xbyak", function() + set_default(false) + set_description("Enable trampoline support for Xbyak") + add_defines("SFSE_SUPPORT_XBYAK=1") +end) + +-- define targets +target("commonlibsf") + -- set target kind + set_kind("static") + + -- add packages + add_packages("spdlog", { public = true }) + + if has_config("sfse_xbyak") then + add_packages("xbyak") + end + + -- add options + add_options("sfse_xbyak") + + -- add system links + add_syslinks("advapi32", "dbghelp", "ole32", "shell32", "user32", "version", "Ws2_32") + + -- add source files + add_files("src/**.cpp") + + -- add header files + add_includedirs("include", { public = true }) + add_headerfiles( + "include/(RE/**.h)", + "include/(REL/**.h)", + "include/(SFSE/**.h)" + ) + + -- set precompiled header + set_pcxxheader("include/SFSE/Impl/PCH.h") + + -- add flags + add_cxxflags("/permissive-") + + -- add flags (cl) + add_cxxflags( + "cl::/bigobj", + "cl::/cgthreads8", + "cl::/diagnostics:caret", + "cl::/external:W0", + "cl::/fp:contract", + "cl::/fp:except-", + "cl::/guard:cf-", + "cl::/Zc:enumTypes", + "cl::/Zc:preprocessor", + "cl::/Zc:templateScope" + ) + + -- add flags (cl: warnings -> errors) + add_cxxflags("cl::/we4715") -- `function` : not all control paths return a value + + -- add flags (cl: disable warnings) + add_cxxflags( + "cl::/wd4005", -- macro redefinition + "cl::/wd4061", -- enumerator `identifier` in switch of enum `enumeration` is not explicitly handled by a case label + "cl::/wd4068", -- unknown pragma 'clang' + "cl::/wd4200", -- nonstandard extension used : zero-sized array in struct/union + "cl::/wd4201", -- nonstandard extension used : nameless struct/union + "cl::/wd4264", -- 'virtual_function' : no override available for virtual member function from base 'class'; function is hidden + "cl::/wd4265", -- 'type': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly + "cl::/wd4266", -- 'function' : no override available for virtual member function from base 'type'; function is hidden + "cl::/wd4324", -- 'struct_name' : structure was padded due to __declspec(align()) + "cl::/wd4371", -- 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member' + "cl::/wd4514", -- 'function' : unreferenced inline function has been removed + "cl::/wd4582", -- 'type': constructor is not implicitly called + "cl::/wd4583", -- 'type': destructor is not implicitly called + "cl::/wd4623", -- 'derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted + "cl::/wd4625", -- 'derived class' : copy constructor was implicitly defined as deleted because a base class copy constructor is inaccessible or deleted + "cl::/wd4626", -- 'derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted + "cl::/wd4686", -- 'user-defined type' : possible change in behavior, change in UDT return calling convention + "cl::/wd4710", -- 'function' : function not inlined + "cl::/wd4711", -- function 'function' selected for inline expansion + "cl::/wd4820", -- 'bytes' bytes padding added after construct 'member_name' + "cl::/wd5082", -- second argument to 'va_start' is not the last named parameter + "cl::/wd5026", -- 'type': move constructor was implicitly defined as deleted + "cl::/wd5027", -- 'type': move assignment operator was implicitly defined as deleted + "cl::/wd5045", -- compiler will insert Spectre mitigation for memory load if /Qspectre switch specified + "cl::/wd5053", -- support for 'explicit()' in C++17 and earlier is a vendor extension + "cl::/wd5105", -- macro expansion producing 'defined' has undefined behavior (workaround for older msvc bug) + "cl::/wd5204", -- 'type-name': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly + "cl::/wd5220" -- 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial + ) + + -- add flags (clang-cl: disable warnings) + add_cxxflags( + "clang_cl::-Wno-delete-non-abstract-non-virtual-dtor", + "clang_cl::-Wno-inconsistent-missing-override", + "clang_cl::-Wno-overloaded-virtual", + "clang_cl::-Wno-reinterpret-base-class" + )