btach/SkyrimOutfitSystemSE
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First blood

Browse source
This commit is contained in:
MetricExpansion 2022-10-08 18:46:52 -07:00
parent f91333fc68
commit a0ce24c91f
5 changed files with 24 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -49,16 +49,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
################################################################################
set(SKSE_SUPPORT_XBYAK 1)
message(STATUS "SKYRIM_VERSION is ${SKYRIM_VERSION}")
if("${SKYRIM_VERSION}" STREQUAL "AE1")
add_subdirectory(dependencies/CommonLibSSE_AE)
elseif("${SKYRIM_VERSION}" STREQUAL "AE2")
add_subdirectory(dependencies/CommonLibSSE_AE)
elseif("${SKYRIM_VERSION}" STREQUAL "PRE_AE")
add_subdirectory(dependencies/CommonLibSSE_PRE_AE)
else()
message(FATAL_ERROR "Must set SKYRIM_VERSION to one of: PRE_AE, AE1, AE2")
endif()
find_package(CommonLibSSE REQUIRED)
################################################################################
# Build Protocol Buffers
@ -82,7 +73,6 @@ string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
$<$<CONFIG:Release>:MultiThreaded>)
# Also force it on CommonLibSSE and Protobuf
set_target_properties(CommonLibSSE PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
set_target_properties(ProtocolBuffers PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
################################################################################
@ -129,7 +119,6 @@ target_precompile_headers(SkyrimOutfitSystemSE PRIVATE
target_compile_definitions(SkyrimOutfitSystemSE PRIVATE
XBYAK_NO_OP_NAMES
"SKYRIM_VERSION_IS_${SKYRIM_VERSION}=1"
)
target_compile_features(SkyrimOutfitSystemSE PRIVATE
@ -169,7 +158,7 @@ endif()
# Install steps
################################################################################
add_custom_command(TARGET SkyrimOutfitSystemSE POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:SkyrimOutfitSystemSE> "${CMAKE_CURRENT_SOURCE_DIR}/mod_files/PluginVersions/SkyrimOutfitSystemSE_${SKYRIM_VERSION}.dll"
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:SkyrimOutfitSystemSE> "${CMAKE_CURRENT_SOURCE_DIR}/mod_files/PluginVersions/SkyrimOutfitSystemSE_ALL.dll"
)
################################################################################
@ -181,7 +170,7 @@ find_package(spdlog REQUIRED CONFIG)
find_package(xbyak REQUIRED CONFIG)
target_link_libraries(SkyrimOutfitSystemSE PUBLIC
CommonLibSSE
CommonLibSSE::CommonLibSSE
nonstd::span-lite
spdlog::spdlog
ProtocolBuffers

37
include/SOS_PCH.h
View file

@ -7,48 +7,11 @@
#include "version.h"
#if SKYRIM_VERSION_IS_AE1 || SKYRIM_VERSION_IS_AE2
#define SKYRIM_VERSION_IS_SOME_AE 1
#endif
#pragma warning(push)
#if SKYRIM_VERSION_IS_SOME_AE
#include "SKSE/Impl/PCH.h"
#include <RE/Skyrim.h>
#include <REL/Relocation.h>
#include <SKSE/SKSE.h>
#include <RE/A/Actor.h>
#include <RE/M/Misc.h>
#include "RE/T/TESObjectARMO.h"
#include "RE/P/PlayerCharacter.h"
#include "RE/A/ActorEquipManager.h"
#include "RE/I/InventoryChanges.h"
#include "RE/I/InventoryEntryData.h"
#include "RE/P/PlayerCharacter.h"
#include "RE/T/TESObjectARMO.h"
#include "RE/T/TESObjectREFR.h"
#include "RE/I/IVirtualMachine.h"
#include "RE/T/TESForm.h"
#include "RE/I/IVirtualMachine.h"
#elif SKYRIM_VERSION_IS_PRE_AE
#include "SKSE/Impl/PCH.h"
#include <RE/Skyrim.h>
#include <REL/Relocation.h>
#include <SKSE/SKSE.h>
#include <RE/A/Actor.h>
#include <RE/M/Misc.h>
#include "RE/T/TESObjectARMO.h"
#include "RE/P/PlayerCharacter.h"
#include "RE/A/ActorEquipManager.h"
#include "RE/I/InventoryChanges.h"
#include "RE/I/InventoryEntryData.h"
#include "RE/P/PlayerCharacter.h"
#include "RE/T/TESObjectARMO.h"
#include "RE/T/TESObjectREFR.h"
#include "RE/I/IVirtualMachine.h"
#include "RE/T/TESForm.h"
#include "RE/I/IVirtualMachine.h"
#endif
#ifdef NDEBUG
# include <spdlog/sinks/basic_file_sink.h>

3
src/Utility.cpp
View file

@ -6,6 +6,9 @@
#include "SKSE/SKSE.h"
#undef GetModuleFileName
#undef GetModuleHandle
std::string GetRuntimePath() {
static char appPath[4096] = {0};

16
vcpkg-configuration.json Normal file
View file

@ -0,0 +1,16 @@
{
"registries": [
{
"kind": "git",
"repository": "https://gitlab.com/colorglass/vcpkg-colorglass",
"baseline": "1b279b20c7e0db1c9d549ff3b64e024c01317b55",
"packages": [
"commonlibsse-ng",
"commonlibsse-ng-ae",
"commonlibsse-ng-se",
"commonlibsse-ng-vr",
"commonlibsse-ng-flatrim"
]
}
]
}

3
vcpkg.json
View file

@ -9,7 +9,8 @@
"protobuf",
"boost-stl-interfaces",
"rsm-binary-io",
"xbyak"
"xbyak",
"commonlibsse-ng-flatrim"
],
"builtin-baseline": "687f4aab11df9b1a854d0d7207c558da545b4cc9"
}