Skip to content

Commit

Permalink
Merge branch 'main' into VM_WIP
Browse files Browse the repository at this point in the history
# Conflicts:
#	CommonLibSF/CMakeLists.txt
#	include/RE/B/BSResourceEnums.h
#	include/RE/B/BSStorage.h
#	include/RE/B/BSTFreeList.h
#	include/RE/B/BSTObjectArena.h
#	include/RE/B/BSTimer.h
#	include/RE/C/CompiledScriptLoader.h
#	include/RE/G/GameVM.h
#	include/RE/H/HandleReaderWriter.h
#	include/RE/I/IClientVM.h
#	include/RE/I/IHandleReaderWriter.h
#	include/RE/I/ILoader.h
#	include/RE/I/IMemoryPagePolicy.h
#	include/RE/I/IObjectProcessor.h
#	include/RE/I/IProfilePolicy.h
#	include/RE/I/IRemoteDebugger.h
#	include/RE/I/IStackCallbackSaveInterface.h
#	include/RE/I/IStore.h
#	include/RE/L/LinkerProcessor.h
#	include/RE/P/Profiler.h
#	include/RE/R/ReadableStringTable.h
#	include/RE/R/ReadableTypeTable.h
#	include/RE/R/RemoteDebugger.h
#	include/RE/S/SimpleAllocMemoryPagePolicy.h
#	include/RE/S/Store.h
#	include/RE/S/Stream.h
#	include/RE/S/StreamBase.h
#	include/RE/S/SuspendedStack.h
#	include/RE/V/VirtualMachine.h
#	include/RE/W/WritableStringTable.h
#	include/RE/W/WritableTypeTable.h
#	src/RE/S/Stream.cpp
#	src/RE/S/StreamBase.cpp
#	src/RE/V/VirtualMachine.cpp
  • Loading branch information
BrodyHiggerson committed Jul 24, 2024
2 parents e7101c6 + 3a56616 commit e98ef26
Show file tree
Hide file tree
Showing 545 changed files with 498 additions and 1,846 deletions.
File renamed without changes.
File renamed without changes.
43 changes: 0 additions & 43 deletions .github/update-registry.ps1

This file was deleted.

9 changes: 6 additions & 3 deletions .github/workflows/main_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -28,8 +31,8 @@ jobs:
uses: TheMrMilchmann/setup-msvc-dev@v3
with:
arch: x64
toolset: 14.37
toolset: 14.40

- name: Build
run: |
${{ github.workspace }}/scripts/build-release-${{ matrix.compiler }}-cpm-test.bat
${{ github.workspace }}/scripts/build-release-${{ matrix.compiler }}-test.bat
10 changes: 6 additions & 4 deletions .github/workflows/main_ci_xmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ on:
pull_request:
branches: [main, feature/*, fix/*]
paths:
- "CommonLibSF/**"
- "src/**"
- "include/**"
- ".github/workflows/**"
- "xmake.lua"
workflow_dispatch:

Expand All @@ -21,12 +23,12 @@ jobs:
uses: actions/checkout@v4

- name: Setup XMake
uses: xmake-io/github-action-setup-xmake@v1.0.13
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: "2.8.2"
xmake-version: "latest"

- name: Configure
run: xmake config -y --mode=${{ matrix.mode }} --vs_toolset=14.37
run: xmake config -y --mode=${{ matrix.mode }} --vs_toolset=14.40

- name: Build
run: xmake build -y -vD
29 changes: 7 additions & 22 deletions .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ on:
push:
branches: main
paths:
- "CommonLibSF/**"
- "src/**"
- "include/**"
- ".github/workflows/**"
workflow_dispatch:

concurrency:
Expand All @@ -21,37 +23,20 @@ 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.16.2
uses: DoozyX/clang-format-lint-action@v0.17
with:
source: "."
exclude: "./docs"
extensions: "c,cc,cpp,cppm,cxx,h,hpp,hxx,inl,inc,ixx,mxx"
clangFormatVersion: 16
clangFormatVersion: 17
inplace: True

- name: Update vcpkg port version
id: versioning
shell: pwsh
run: "& ${{ github.workspace }}/.github/update-registry.ps1 ${{ github.workspace }}"

- name: Check failure
run: exit 1
if: ${{ steps.versioning.outputs.VCPKG_SUCCESS == 'false' }}

- name: Add & Commit
id: registry
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
message: "ci: maintenance `${{ steps.versioning.outputs.VCPKG_VERSION }}`"

- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.VCPKG_HELPER_TOKEN }}
repository: ${{ github.repository_owner }}/Starfield-RE-vcpkg
event-type: update-event
client-payload: '{"sha": "${{ steps.registry.outputs.commit_long_sha }}", "vcpkg-version": "${{ steps.versioning.outputs.VCPKG_VERSION }}"}'
message: "ci: maintenance"
6 changes: 3 additions & 3 deletions .github/workflows/update_pdb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ jobs:
uses: TheMrMilchmann/setup-msvc-dev@v3
with:
arch: x64
toolset: 14.37
toolset: 14.40

- name: Build
run: |
${{ github.workspace }}/scripts/build-debug-msvc-cpm-test.bat
${{ github.workspace }}/scripts/build-debug-msvc-test.bat
- name: Find PDB
run: |
$pdb = Get-ChildItem -Path "${{ github.workspace }}" -Filter "CommonLibSF-test.pdb" -Recurse -ErrorAction SilentlyContinue -Force
"PDB_PATH=$pdb" >> $env:GITHUB_ENV
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: CommonLibSF.pdb
path: ${{ env.PDB_PATH }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ graph_info.json
/CommonLibSF/.vs
/CommonLibSF/out
/vsxmake*

.idea
*ReSharper*
170 changes: 167 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,183 @@
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)

file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/include/*"
"${CMAKE_CURRENT_SOURCE_DIR}/src/*"
)

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
"$<$<BOOL:${SFSE_SUPPORT_XBYAK}>: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(<expr>)' 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
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
)

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}
)
Loading

0 comments on commit e98ef26

Please sign in to comment.