Skip to content

Commit

Permalink
update project for release
Browse files Browse the repository at this point in the history
  • Loading branch information
shad0wshayd3 committed May 9, 2024
1 parent 7a17306 commit 6d6b2a2
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 51 deletions.
File renamed without changes.
15 changes: 15 additions & 0 deletions EXCEPTIONS
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
This Program is intended to be used with and modify existing code (the "Modded Code") and to build a robust modding community with open source principles. The purpose of this exception is to address issues when an open source modding community interacts with potentially proprietary code. In addition, the modding community often uses libraries (the "Modding Libraries") under licenses that may be incompatible with the GPL ("Modding Library Licenses").

===

Modding Exception

In addition, as a special exception, the authors gives You the additional right to link the code of this Program with the existing code that this Program is intended to be used with or modify and to distribute linked combinations including the two, subject to the limitations in this paragraph. Modded Code permitted under this exception may link to the code of this Program without causing the Modded Code and portion of the combined work corresponding to the Modded Code to be covered by the GNU General Public License. You must obey the GNU General Public License in all respects for all of the Program code and other code used in conjunction with the Program except the Modded Code covered by this exception. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to provide this exception without modification, you must delete this exception statement from your version and license this file solely under the GPL without exception.

===

GPL-3.0 Linking Exception (with Corresponding Source)

Additional permission under GNU GPL version 3 section 7

If you modify this Program, or any covered work, by linking or combining it with Modding Libraries (or a modified version thereof), containing parts covered by the terms of Modding Library Licenses, the licensors of this Program grant you additional permission to convey the resulting work. Corresponding Source for a non-source form of such a combination shall include the source code for the parts of Modding Libraries used as well as that of the covered work.
20 changes: 10 additions & 10 deletions Plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ target_include_directories(

# linkage
target_link_libraries(
${PROJECT_NAME}
${PROJECT_NAME}
PRIVATE
DKUtil::DKUtil
CommonLibF4::CommonLibF4
Expand Down Expand Up @@ -116,17 +116,17 @@ target_precompile_headers(
)

set_property(
TARGET
TARGET
${PROJECT_NAME}
PROPERTY VS_USER_PROPS
PROPERTY VS_USER_PROPS
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/build_stl_modules.props"
)

# update deployments
add_custom_command(
TARGET
${PROJECT_NAME}
POST_BUILD
COMMAND powershell -NoProfile -ExecutionPolicy Bypass -File
"${CMAKE_CURRENT_SOURCE_DIR}/!update.ps1" "DISTRIBUTE" "${PROJECT_VERSION}" "${CMAKE_CURRENT_BINARY_DIR}/$(ConfigurationName)" "${PROJECT_NAME}"
)
add_custom_command(
TARGET
${PROJECT_NAME}
POST_BUILD
COMMAND powershell -NoProfile -ExecutionPolicy Bypass -File
"${CMAKE_CURRENT_SOURCE_DIR}/!update.ps1" "DISTRIBUTE" "${PROJECT_VERSION}" "${CMAKE_CURRENT_BINARY_DIR}/$(ConfigurationName)" "${PROJECT_NAME}"
)
16 changes: 7 additions & 9 deletions Plugin/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"hidden": true,
"cacheVariables": {
"CMAKE_CXX_FLAGS": "$env{PROJECT_PLATFORM_FLAGS} $env{PROJECT_TEXT_FLAGS} $env{PROJECT_COMPILER_FLAGS} $penv{CXXFLAGS}",
"F4SE_SUPPORT_XBYAK": "ON",
"USING_VCPKG": true
"F4SE_SUPPORT_XBYAK": "ON"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
Expand All @@ -26,10 +25,9 @@
"name": "packaging-vcpkg",
"hidden": true,
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": {
"type": "STRING",
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
},
"USING_VCPKG": "ON",
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"VCPKG_HOST_TRIPLET": "x64-windows-static-md",
"VCPKG_TARGET_TRIPLET": "x64-windows-static-md"
}
},
Expand Down Expand Up @@ -70,7 +68,7 @@
"name": "compiler-msvc",
"hidden": true,
"environment": {
"PROJECT_COMPILER_FLAGS": "/cgthreads8 /diagnostics:caret /fp:contract /fp:except- /guard:cf- /permissive- /Zc:__cplusplus /Zc:enumTypes /Zc:lambda /Zc:preprocessor /Zc:referenceBinding /Zc:rvalueCast /Zc:templateScope /Zc:ternary /Zc:preprocessor /EHsc /MP /W4 /WX /external:anglebrackets /external:W0",
"PROJECT_COMPILER_FLAGS": "/cgthreads8 /diagnostics:caret /fp:contract /fp:except- /guard:cf- /permissive- /Zc:__cplusplus /Zc:lambda /Zc:preprocessor /Zc:referenceBinding /Zc:rvalueCast /Zc:templateScope /Zc:ternary /Zc:preprocessor /EHsc /MP /W4 /external:anglebrackets /external:W0",
"PROJECT_COMPILER": "msvc"
}
},
Expand Down Expand Up @@ -102,7 +100,7 @@
"environment": {
"CC": "clang-cl",
"CXX": "clang-cl",
"PROJECT_COMPILER_FLAGS": "/permissive- /EHsc /W4 /WX -Wno-overloaded-virtual -Wno-delete-non-abstract-non-virtual-dtor -Wno-inconsistent-missing-override -Wno-reinterpret-base-class -D__cpp_consteval"
"PROJECT_COMPILER_FLAGS": "/permissive- /EHsc /W4 -Wno-overloaded-virtual -Wno-delete-non-abstract-non-virtual-dtor -Wno-inconsistent-missing-override -Wno-reinterpret-base-class -D__cpp_consteval"
}
},
{
Expand Down Expand Up @@ -230,4 +228,4 @@
"displayName": "8. (Release) Clang - MSVC"
}
]
}
}
1 change: 0 additions & 1 deletion Plugin/cmake/common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE FILEPATH "")


# out-of-source builds only
Expand Down
2 changes: 1 addition & 1 deletion Plugin/cmake/version.rc.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ BEGIN
VALUE "FileDescription", "@PROJECT_NAME@"
VALUE "FileVersion", "@PROJECT_VERSION@.0"
VALUE "InternalName", "@PROJECT_NAME@"
VALUE "LegalCopyright", "GPLv3 License"
VALUE "LegalCopyright", "GPL-3.0 or later WITH Modding Exception AND GPL-3.0 Linking Exception(with Corresponding Source)"
VALUE "ProductName", "@PROJECT_NAME@"
VALUE "ProductVersion", "@PROJECT_VERSION@.0"
END
Expand Down
2 changes: 1 addition & 1 deletion Plugin/src/PCH.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

// c
#include <cassert>
Expand Down
31 changes: 12 additions & 19 deletions Plugin/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
{
"name": "bakamaxpapyrusops",
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"dependencies": [
"boost-stl-interfaces",
"fmt",
"nlohmann-json",
"rsm-mmio",
"simpleini",
"spdlog",
"tomlplusplus",
"xbyak"
],
"builtin-baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6",
"overrides": [
{
"name": "tomlplusplus",
"version": "3.1.0"
}
]
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "bakamaxpapyrusops",
"homepage": "https://github.com/shad0wshayd3-FO4/BakaMaxPapyrusOps",
"dependencies": [
"boost-stl-interfaces",
"nlohmann-json",
"rsm-mmio",
"simpleini",
"spdlog",
"tomlplusplus",
"xbyak"
]
}
4 changes: 0 additions & 4 deletions build-clang-cl.bat

This file was deleted.

2 changes: 1 addition & 1 deletion build-msvc.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
echo off
rd /s /q "build"
rd /s /q "%~dp0/build"
cmake -B "%~dp0/build" -S "%~dp0/Plugin" --preset=build-release-msvc-msvc
cmake --build "%~dp0/build"
2 changes: 1 addition & 1 deletion extern/CommonLibF4
3 changes: 0 additions & 3 deletions make-sln-clang-cl.bat

This file was deleted.

2 changes: 1 addition & 1 deletion make-sln-msvc.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
echo off
rd /s /q "build"
rd /s /q "%~dp0/build"
cmake -B "%~dp0/build" -S "%~dp0/Plugin" --preset=build-debug-msvc-msvc

0 comments on commit 6d6b2a2

Please sign in to comment.