Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update workflow #8

Merged
merged 4 commits into from
Feb 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -28,7 +28,7 @@ jobs:
./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt

- name: Cache vcpkg
uses: actions/cache@v2
uses: actions/cache@v4
id: vcpkg-cache
env:
cache-name: vcpkg-cache
Expand All @@ -37,14 +37,13 @@ jobs:
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }}

- name: Configure CMake
run: cmake --preset github-workflows
run: cmake --preset github-workflows -Wno-deprecated

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: MapMarkerFramework
path: ${{ github.workspace }}/build/${{ env.BUILD_TYPE }}/MapMarkerFramework.dll

2 changes: 1 addition & 1 deletion external/CommonLibSSE
Submodule CommonLibSSE updated 86 files
+25 −1 cmake/sourcelist.cmake
+38 −38 include/RE/A/ActorValueInfo.h
+53 −1 include/RE/B/BGSEntryPoint.h
+85 −0 include/RE/B/BGSEntryPointFunction.h
+9 −8 include/RE/B/BGSEntryPointFunctionData.h
+13 −13 include/RE/B/BGSEntryPointFunctionDataActivateChoice.h
+2 −2 include/RE/B/BGSEntryPointFunctionDataOneValue.h
+2 −2 include/RE/B/BGSEntryPointFunctionDataText.h
+5 −1 include/RE/B/BGSSkillPerkTreeNode.h
+6 −6 include/RE/B/BSGamepadDevice.h
+8 −8 include/RE/B/BSIInputDevice.h
+4 −4 include/RE/B/BSInputDevice.h
+2 −0 include/RE/B/BSInputDeviceManager.h
+120 −0 include/RE/B/BSInputEventQueue.h
+5 −5 include/RE/B/BSPCGamepadDeviceDelegate.h
+8 −8 include/RE/B/BSPCGamepadDeviceHandler.h
+23 −0 include/RE/B/BSResource.h
+55 −0 include/RE/B/BSScaleformExternalTexture.h
+51 −0 include/RE/B/BSScaleformImageLoader.h
+47 −0 include/RE/B/BSSystemUtility.h
+15 −3 include/RE/B/BSVirtualKeyboardDevice.h
+20 −25 include/RE/B/BSWin32GamepadDevice.h
+6 −6 include/RE/B/BSWin32KeyboardDevice.h
+5 −5 include/RE/B/BSWin32MouseDevice.h
+66 −0 include/RE/B/BSWin32SystemUtility.h
+7 −7 include/RE/B/BSWin32VirtualKeyboardDevice.h
+14 −14 include/RE/B/BookMenu.h
+47 −1 include/RE/B/ButtonEvent.h
+24 −0 include/RE/B/bhkAabbPhantom.h
+66 −0 include/RE/C/CCallback.h
+23 −0 include/RE/C/CharEvent.h
+12 −10 include/RE/C/ControlMap.h
+8 −8 include/RE/C/CreationClubMenu.h
+6 −0 include/RE/D/DeviceConnectEvent.h
+28 −0 include/RE/D/DirectionHandler.h
+3 −0 include/RE/E/Effect.h
+20 −0 include/RE/G/GFxImageLoader.h
+2 −2 include/RE/G/GFxMovieDef.h
+32 −0 include/RE/G/GImageInfo.h
+36 −0 include/RE/G/GImageInfoBase.h
+24 −0 include/RE/G/GImageInfoBaseImpl.h
+0 −14 include/RE/I/ImageData.h
+6 −0 include/RE/K/KinectEvent.h
+23 −0 include/RE/L/LegendarySkillResetConfirmCallback.h
+32 −0 include/RE/L/LoadedAreaBound.h
+2 −2 include/RE/L/LocalMapMenu.h
+20 −0 include/RE/L/LooseFileLocation.h
+7 −7 include/RE/M/MainMenu.h
+17 −17 include/RE/M/MenuControls.h
+39 −0 include/RE/M/MenuCursor.h
+0 −1 include/RE/M/Misc.h
+3 −1 include/RE/M/MistMenu.h
+13 −0 include/RE/M/MouseMoveEvent.h
+69 −4 include/RE/Offsets.h
+7,759 −3,346 include/RE/Offsets_RTTI_VR.h
+67 −1 include/RE/Offsets_VR.h
+1 −1 include/RE/R/RegisterPrefix.h
+52 −27 include/RE/S/State.h
+21 −1 include/RE/Skyrim.h
+88 −80 include/RE/T/TES.h
+42 −24 include/RE/T/TESDataHandler.h
+1 −1 include/RE/T/TESFile.h
+19 −0 include/RE/T/ThumbstickEvent.h
+3 −2 include/RE/U/UserEvents.h
+14 −0 include/RE/V/VRWandEvent.h
+15 −0 include/RE/V/VrWandTouchpadPositionEvent.h
+14 −0 include/RE/V/VrWandTouchpadSwipeEvent.h
+31 −0 include/SKSE/Impl/WinAPI.h
+50 −0 include/SKSE/MergeMapper.h
+1 −0 include/SKSE/SKSE.h
+24 −17 include/SKSE/Trampoline.h
+2 −1 include/SKSE/Version.h
+2 −2 src/RE/B/BGSEntryPointFunctionDataActivateChoice.cpp
+11 −0 src/RE/B/BGSSkillPerkTreeNode.cpp
+6 −0 src/RE/B/BSInputDeviceManager.cpp
+163 −0 src/RE/B/BSInputEventQueue.cpp
+43 −4 src/RE/C/ControlMap.cpp
+14 −0 src/RE/E/Effect.cpp
+1 −1 src/RE/G/GFxMovieDef.cpp
+3 −30 src/RE/I/IMenu.cpp
+1 −1 src/RE/I/IVirtualMachine.cpp
+0 −7 src/RE/M/Misc.cpp
+92 −19 src/RE/T/TESDataHandler.cpp
+10 −1 src/SKSE/Logger.cpp
+28 −0 src/SKSE/MergeMapper.cpp
+3 −3 src/SKSE/Translation.cpp
9 changes: 8 additions & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "mapmarkerframework",
"version": "2",
"dependencies": [
Expand All @@ -11,5 +11,12 @@
"jsoncpp",
"simpleini",
"tsl-ordered-map"
],
"builtin-baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48",
"overrides": [
{
"name": "xbyak",
"version": "6.69"
}
]
}