mirror of
https://github.com/ModOrganizer2/mob.git
synced 2026-07-27 14:07:05 -07:00
Compare commits
25
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5602cba88e | ||
|
|
e0ba155231 | ||
|
|
d06ee4e54b | ||
|
|
e3ef6d11f3 | ||
|
|
b0a473f321 | ||
|
|
52e9840494 | ||
|
|
a3a976e5e9 | ||
|
|
64c62ad9a8 | ||
|
|
98a71eae17 | ||
|
|
3eea9f228f | ||
|
|
facd852e3f | ||
|
|
8bf4671496 | ||
|
|
612ef324bc | ||
|
|
621daac2ec | ||
|
|
044a158340 | ||
|
|
c29b1adca1 | ||
|
|
ec6bb2a177 | ||
|
|
bd6a03d2f8 | ||
|
|
1087129aac | ||
|
|
237bd6ab5e | ||
|
|
b3c66b3221 | ||
|
|
9f1b33f3bd | ||
|
|
ec429c01d6 | ||
|
|
eba5bf49bd | ||
|
|
a308e75cf8 |
@@ -2,15 +2,20 @@ name: Build Mob
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: master
|
branches: [master]
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize, reopened]
|
types: [opened, synchronize, reopened]
|
||||||
|
|
||||||
|
env:
|
||||||
|
VCPKG_BINARY_SOURCES: ${{ vars.AZ_BLOB_VCPKG_URL != '' && format('clear;x-azblob,{0},{1},readwrite', vars.AZ_BLOB_VCPKG_URL, secrets.AZ_BLOB_SAS) || '' }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-2022
|
runs-on: windows-2022
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Build Mob
|
- name: Build Mob
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: ./bootstrap.ps1 -Verbose
|
run: |
|
||||||
|
$env:VCPKG_ROOT = $env:VCPKG_INSTALLATION_ROOT
|
||||||
|
./bootstrap.ps1 -Verbose
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v6
|
||||||
- name: Check format
|
- name: Check format
|
||||||
uses: ModOrganizer2/check-formatting-action@master
|
uses: ModOrganizer2/check-formatting-action@master
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
repos:
|
||||||
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
|
rev: v6.0.0
|
||||||
|
hooks:
|
||||||
|
- id: trailing-whitespace
|
||||||
|
exclude: '^(third-party|licenses)/.*$'
|
||||||
|
- id: end-of-file-fixer
|
||||||
|
exclude: '^(third-party|licenses)/.*$'
|
||||||
|
- id: check-merge-conflict
|
||||||
|
exclude: '^(third-party|licenses)/.*$'
|
||||||
|
- id: check-case-conflict
|
||||||
|
exclude: '^(third-party|licenses)/.*$'
|
||||||
|
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||||
|
rev: v22.1.5
|
||||||
|
hooks:
|
||||||
|
- id: clang-format
|
||||||
|
'types_or': [c++, c]
|
||||||
|
exclude: '^third-party/.*$'
|
||||||
|
|
||||||
|
ci:
|
||||||
|
autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
|
||||||
|
autofix_prs: true
|
||||||
|
autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
|
||||||
|
autoupdate_schedule: quarterly
|
||||||
|
submodules: false
|
||||||
+6
-1
@@ -1,6 +1,11 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
project(mob)
|
project(mob LANGUAGES CXX)
|
||||||
|
|
||||||
|
find_package(clipp CONFIG REQUIRED)
|
||||||
|
find_package(nlohmann_json CONFIG REQUIRED)
|
||||||
|
find_package(CURL REQUIRED)
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
||||||
set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)
|
set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
{
|
||||||
|
"version": 6,
|
||||||
|
"configurePresets": [
|
||||||
|
{
|
||||||
|
"name": "vcpkg",
|
||||||
|
"generator": "Visual Studio 17 2022",
|
||||||
|
"architecture": "x64",
|
||||||
|
"binaryDir": "${sourceDir}/build/",
|
||||||
|
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||||
|
"cacheVariables": {
|
||||||
|
"VCPKG_TARGET_TRIPLET": "x64-windows-static-md",
|
||||||
|
"CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"buildPresets": [
|
||||||
|
{
|
||||||
|
"name": "Base",
|
||||||
|
"hidden": true,
|
||||||
|
"nativeToolOptions": [
|
||||||
|
"-m",
|
||||||
|
"-noLogo",
|
||||||
|
"-p:UseMultiToolTask=true",
|
||||||
|
"-p:EnforceProcessCountAcrossBuilds=true"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Debug",
|
||||||
|
"configurePreset": "vcpkg",
|
||||||
|
"inherits": "Base",
|
||||||
|
"configuration": "Debug"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Release",
|
||||||
|
"configurePreset": "vcpkg",
|
||||||
|
"inherits": "Base",
|
||||||
|
"configuration": "Release"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "RelWithDebInfo",
|
||||||
|
"configurePreset": "vcpkg",
|
||||||
|
"inherits": "Base",
|
||||||
|
"configuration": "RelWithDebInfo"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
+6
-31
@@ -11,41 +11,16 @@ if (!$root) {
|
|||||||
$root = "."
|
$root = "."
|
||||||
}
|
}
|
||||||
|
|
||||||
$output = if ($Verbose) { "Out-Default" } else { "Out-Null" }
|
$logLevel = if ($Verbose) { "STATUS" } else { "ERROR" }
|
||||||
|
|
||||||
cmake -B $root/build $root | & $output
|
cmake --preset vcpkg --log-level=$logLevel
|
||||||
|
|
||||||
$installationPath = & $root\third-party\bin\vswhere.exe -products * -nologo -prerelease -latest -property installationPath
|
if ($Verbose) {
|
||||||
if (! $?) {
|
cmake --build --preset $Config --verbose
|
||||||
Write-Error "vswhere returned $LastExitCode"
|
} else {
|
||||||
exit $LastExitCode
|
cmake --build --preset $Config
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $installationPath) {
|
|
||||||
Write-Error "Empty installation path"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
$opts = ""
|
|
||||||
$opts += " $root\build\mob.sln"
|
|
||||||
$opts += " -m"
|
|
||||||
$opts += " -p:Configuration=${Config}"
|
|
||||||
$opts += " -noLogo"
|
|
||||||
$opts += " -p:UseMultiToolTask=true"
|
|
||||||
$opts += " -p:EnforceProcessCountAcrossBuilds=true"
|
|
||||||
|
|
||||||
if (!$Verbose) {
|
|
||||||
$opts += " -clp:ErrorsOnly;Verbosity=minimal"
|
|
||||||
}
|
|
||||||
|
|
||||||
$vsDevCmd = "$installationPath\Common7\Tools\VsDevCmd.bat"
|
|
||||||
if (!(Test-Path "$vsDevCmd")) {
|
|
||||||
Write-Error "VdDevCmd.bat not found at $vsDevCmd"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
& "${env:COMSPEC}" /c "`"$vsDevCmd`" -no_logo -arch=amd64 -host_arch=amd64 && msbuild $opts"
|
|
||||||
|
|
||||||
if (! $?) {
|
if (! $?) {
|
||||||
Write-Error "Build failed"
|
Write-Error "Build failed"
|
||||||
exit $LastExitCode
|
exit $LastExitCode
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||||
|
"name": "zlib",
|
||||||
|
"version-string": "zlib-ng overlay",
|
||||||
|
"dependencies": [
|
||||||
|
"zlib-ng"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
set(VCPKG_TARGET_ARCHITECTURE x64)
|
||||||
|
set(VCPKG_CRT_LINKAGE dynamic)
|
||||||
|
set(VCPKG_LIBRARY_LINKAGE static)
|
||||||
|
|
||||||
|
set(ZLIB_COMPAT ON)
|
||||||
|
set(nlohmann-json_IMPLICIT_CONVERSIONS OFF)
|
||||||
+110
-49
@@ -1,27 +1,28 @@
|
|||||||
7-Zip
|
7-Zip source code
|
||||||
~~~~~
|
~~~~~~~~~~~~~~~~~
|
||||||
License for use and distribution
|
License for use and distribution
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
7-Zip Copyright (C) 1999-2023 Igor Pavlov.
|
7-Zip Copyright (C) 1999-2026 Igor Pavlov.
|
||||||
|
|
||||||
The licenses for files are:
|
The licenses for files are:
|
||||||
|
|
||||||
1) 7z.dll:
|
- CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction"
|
||||||
- The "GNU LGPL" as main license for most of the code
|
- CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License"
|
||||||
- The "GNU LGPL" with "unRAR license restriction" for some code
|
- C/ZstdDec.c: the "BSD 3-clause License"
|
||||||
- The "BSD 3-clause License" for some code
|
- C/Xxh64.c: the "BSD 2-clause License"
|
||||||
2) All other files: the "GNU LGPL".
|
- Some files are "public domain" files, if "public domain" status is stated in source file.
|
||||||
|
- the "GNU LGPL" for all other files. If there is no license information in
|
||||||
|
some source file, that file is under the "GNU LGPL".
|
||||||
|
|
||||||
Redistributions in binary form must reproduce related license information from this file.
|
The "GNU LGPL" with "unRAR license restriction" means that you must follow both
|
||||||
|
"GNU LGPL" rules and "unRAR license restriction" rules.
|
||||||
Note:
|
|
||||||
You can use 7-Zip on any computer, including a computer in a commercial
|
|
||||||
organization. You don't need to register or pay for 7-Zip.
|
|
||||||
|
|
||||||
|
|
||||||
GNU LGPL information
|
|
||||||
--------------------
|
|
||||||
|
GNU LGPL information
|
||||||
|
--------------------
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
This library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Lesser General Public
|
modify it under the terms of the GNU Lesser General Public
|
||||||
@@ -33,58 +34,118 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Lesser General Public License for more details.
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
You can receive a copy of the GNU Lesser General Public License from
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not,
|
||||||
|
you can get a copy of the GNU Lesser General Public License from
|
||||||
http://www.gnu.org/
|
http://www.gnu.org/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BSD 3-clause License
|
BSD 3-clause License in 7-Zip code
|
||||||
--------------------
|
----------------------------------
|
||||||
|
|
||||||
The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
|
The "BSD 3-clause License" is used for the following code in 7z.dll
|
||||||
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
|
1) LZFSE data decompression.
|
||||||
that also uses the "BSD 3-clause License":
|
CPP/7zip/Compress/LzfseDecoder.cpp.
|
||||||
|
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
|
||||||
|
that also uses the "BSD 3-clause License".
|
||||||
|
2) ZSTD data decompression.
|
||||||
|
C/ZstdDec.c
|
||||||
|
that code was developed using original zstd decoder code as reference code.
|
||||||
|
The original zstd decoder code was developed by Facebook Inc,
|
||||||
|
that also uses the "BSD 3-clause License".
|
||||||
|
|
||||||
----
|
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
|
||||||
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
|
Copyright (c) Facebook, Inc. All rights reserved.
|
||||||
|
Copyright (c) 2023-2026 Igor Pavlov.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
Text of the "BSD 3-clause License"
|
||||||
|
----------------------------------
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
in the documentation and/or other materials provided with the distribution.
|
list of conditions and the following disclaimer.
|
||||||
|
|
||||||
3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
from this software without specific prior written permission.
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
3. Neither the name of the copyright holder nor the names of its contributors may
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
be used to endorse or promote products derived from this software without
|
||||||
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
specific prior written permission.
|
||||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
----
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
unRAR license restriction
|
BSD 2-clause License in 7-Zip code
|
||||||
-------------------------
|
----------------------------------
|
||||||
|
|
||||||
The decompression engine for RAR archives was developed using source
|
The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
|
||||||
code of unRAR program.
|
C/Xxh64.c
|
||||||
All copyrights to original unRAR code are owned by Alexander Roshal.
|
|
||||||
|
|
||||||
The license for original unRAR code has the following restriction:
|
XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
|
||||||
|
|
||||||
The unRAR sources cannot be used to re-create the RAR compression algorithm,
|
Copyright (c) 2012-2021 Yann Collet.
|
||||||
which is proprietary. Distribution of modified unRAR sources in separate form
|
Copyright (c) 2023-2026 Igor Pavlov.
|
||||||
or as a part of other software is permitted, provided that it is clearly
|
|
||||||
stated in the documentation and source comments that the code may
|
Text of the "BSD 2-clause License"
|
||||||
not be used to develop a RAR (WinRAR) compatible archiver.
|
----------------------------------
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
Igor Pavlov
|
|
||||||
|
unRAR license restriction
|
||||||
|
-------------------------
|
||||||
|
|
||||||
|
The decompression engine for RAR archives was developed using source
|
||||||
|
code of unRAR program.
|
||||||
|
All copyrights to original unRAR code are owned by Alexander Roshal.
|
||||||
|
|
||||||
|
The license for original unRAR code has the following restriction:
|
||||||
|
|
||||||
|
The unRAR sources cannot be used to re-create the RAR compression algorithm,
|
||||||
|
which is proprietary. Distribution of modified unRAR sources in separate form
|
||||||
|
or as a part of other software is permitted, provided that it is clearly
|
||||||
|
stated in the documentation and source comments that the code may
|
||||||
|
not be used to develop a RAR (WinRAR) compatible archiver.
|
||||||
|
|
||||||
|
--
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2012 - present, Victor Zverovich
|
Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
a copy of this software and associated documentation files (the
|
a copy of this software and associated documentation files (the
|
||||||
|
|||||||
@@ -1,177 +0,0 @@
|
|||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
https://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
+7
-9
@@ -2,12 +2,12 @@ A. HISTORY OF THE SOFTWARE
|
|||||||
==========================
|
==========================
|
||||||
|
|
||||||
Python was created in the early 1990s by Guido van Rossum at Stichting
|
Python was created in the early 1990s by Guido van Rossum at Stichting
|
||||||
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
|
Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands
|
||||||
as a successor of a language called ABC. Guido remains Python's
|
as a successor of a language called ABC. Guido remains Python's
|
||||||
principal author, although it includes many contributions from others.
|
principal author, although it includes many contributions from others.
|
||||||
|
|
||||||
In 1995, Guido continued his work on Python at the Corporation for
|
In 1995, Guido continued his work on Python at the Corporation for
|
||||||
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
|
National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)
|
||||||
in Reston, Virginia where he released several versions of the
|
in Reston, Virginia where he released several versions of the
|
||||||
software.
|
software.
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ https://www.python.org/psf/) was formed, a non-profit organization
|
|||||||
created specifically to own Python-related Intellectual Property.
|
created specifically to own Python-related Intellectual Property.
|
||||||
Zope Corporation was a sponsoring member of the PSF.
|
Zope Corporation was a sponsoring member of the PSF.
|
||||||
|
|
||||||
All Python releases are Open Source (see http://www.opensource.org for
|
All Python releases are Open Source (see https://opensource.org for
|
||||||
the Open Source Definition). Historically, most, but not all, Python
|
the Open Source Definition). Historically, most, but not all, Python
|
||||||
releases have also been GPL-compatible; the table below summarizes
|
releases have also been GPL-compatible; the table below summarizes
|
||||||
the various releases.
|
the various releases.
|
||||||
@@ -83,10 +83,8 @@ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
|
|||||||
analyze, test, perform and/or display publicly, prepare derivative works,
|
analyze, test, perform and/or display publicly, prepare derivative works,
|
||||||
distribute, and otherwise use Python alone or in any derivative version,
|
distribute, and otherwise use Python alone or in any derivative version,
|
||||||
provided, however, that PSF's License Agreement and PSF's notice of copyright,
|
provided, however, that PSF's License Agreement and PSF's notice of copyright,
|
||||||
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved"
|
||||||
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation;
|
are retained in Python alone or in any derivative version prepared by Licensee.
|
||||||
All Rights Reserved" are retained in Python alone or in any derivative version
|
|
||||||
prepared by Licensee.
|
|
||||||
|
|
||||||
3. In the event Licensee prepares a derivative work that is based on
|
3. In the event Licensee prepares a derivative work that is based on
|
||||||
or incorporates Python or any part thereof, and wants to make
|
or incorporates Python or any part thereof, and wants to make
|
||||||
@@ -191,9 +189,9 @@ version prepared by Licensee. Alternately, in lieu of CNRI's License
|
|||||||
Agreement, Licensee may substitute the following text (omitting the
|
Agreement, Licensee may substitute the following text (omitting the
|
||||||
quotes): "Python 1.6.1 is made available subject to the terms and
|
quotes): "Python 1.6.1 is made available subject to the terms and
|
||||||
conditions in CNRI's License Agreement. This Agreement together with
|
conditions in CNRI's License Agreement. This Agreement together with
|
||||||
Python 1.6.1 may be located on the Internet using the following
|
Python 1.6.1 may be located on the internet using the following
|
||||||
unique, persistent identifier (known as a handle): 1895.22/1013. This
|
unique, persistent identifier (known as a handle): 1895.22/1013. This
|
||||||
Agreement may also be obtained from a proxy server on the Internet
|
Agreement may also be obtained from a proxy server on the internet
|
||||||
using the following URL: http://hdl.handle.net/1895.22/1013".
|
using the following URL: http://hdl.handle.net/1895.22/1013".
|
||||||
|
|
||||||
3. In the event Licensee prepares a derivative work that is based on
|
3. In the event Licensee prepares a derivative work that is based on
|
||||||
|
|||||||
+18
-45
@@ -1,49 +1,22 @@
|
|||||||
RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP
|
Copyright 2025 Phil Thompson <phil@riverbankcomputing.com>
|
||||||
|
|
||||||
1. This LICENSE AGREEMENT ("the SIP License") is between Riverbank Computing
|
Redistribution and use in source and binary forms, with or without
|
||||||
Limited ("Riverbank"), and the Individual or Organization ("Licensee")
|
modification, are permitted provided that the following conditions are met:
|
||||||
accessing and otherwise using SIP software in source or binary form and its
|
|
||||||
associated documentation. SIP comprises a software tool for generating Python
|
|
||||||
bindings for software C and C++ libraries, and a Python extension module used
|
|
||||||
at runtime by those generated bindings. This License Agreement may also be
|
|
||||||
applied to other software packages written by Riverbank.
|
|
||||||
|
|
||||||
2. Subject to the terms and conditions of this License Agreement, Riverbank
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
|
list of conditions and the following disclaimer.
|
||||||
reproduce, analyze, test, perform and/or display publicly, prepare derivative
|
|
||||||
works, distribute, and otherwise use SIP alone or in any derivative version,
|
|
||||||
provided, however, that Riverbank's License Agreement and Riverbank's notice of
|
|
||||||
copyright, e.g., "Copyright (c) 2015 Riverbank Computing Limited; All Rights
|
|
||||||
Reserved" are retained in SIP alone or in any derivative version prepared by
|
|
||||||
Licensee.
|
|
||||||
|
|
||||||
3. In the event Licensee prepares a derivative work that is based on or
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
incorporates SIP or any part thereof, and wants to make the derivative work
|
this list of conditions and the following disclaimer in the documentation
|
||||||
available to others as provided herein, then Licensee hereby agrees to include
|
and/or other materials provided with the distribution.
|
||||||
in any such work a brief summary of the changes made to SIP.
|
|
||||||
|
|
||||||
4. Licensee may not use SIP to generate Python bindings for any C or C++
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
|
||||||
library for which bindings are already provided by Riverbank.
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
5. Riverbank is making SIP available to Licensee on an "AS IS" basis.
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
|
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND DISCLAIMS ANY
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
|
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
PURPOSE OR THAT THE USE OF SIP WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF SIP FOR ANY
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING,
|
|
||||||
DISTRIBUTING, OR OTHERWISE USING SIP, OR ANY DERIVATIVE THEREOF, EVEN IF
|
|
||||||
ADVISED OF THE POSSIBILITY THEREOF.
|
|
||||||
|
|
||||||
7. This License Agreement will automatically terminate upon a material breach
|
|
||||||
of its terms and conditions.
|
|
||||||
|
|
||||||
8. Nothing in this License Agreement shall be deemed to create any relationship
|
|
||||||
of agency, partnership, or joint venture between Riverbank and Licensee. This
|
|
||||||
License Agreement does not grant permission to use Riverbank trademarks or
|
|
||||||
trade name in a trademark sense to endorse or promote products or services of
|
|
||||||
Licensee, or any third party.
|
|
||||||
|
|
||||||
9. By copying, installing or otherwise using SIP, Licensee agrees to be bound
|
|
||||||
by the terms and conditions of this License Agreement.
|
|
||||||
|
|||||||
+1
-2
@@ -22,5 +22,4 @@ THE SOFTWARE.
|
|||||||
|
|
||||||
-- NOTE: Third party dependency used by this software --
|
-- NOTE: Third party dependency used by this software --
|
||||||
This software depends on the fmt lib (MIT License),
|
This software depends on the fmt lib (MIT License),
|
||||||
and users must comply to its license: https://github.com/fmtlib/fmt/blob/master/LICENSE.rst
|
and users must comply to its license: https://raw.githubusercontent.com/fmtlib/fmt/master/LICENSE
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -1,4 +1,6 @@
|
|||||||
(C) 1995-2017 Jean-loup Gailly and Mark Adler
|
Copyright notice:
|
||||||
|
|
||||||
|
(C) 1995-2022 Jean-loup Gailly and Mark Adler
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ git_shallow = false
|
|||||||
|
|
||||||
[usvfs:task]
|
[usvfs:task]
|
||||||
git_shallow = false
|
git_shallow = false
|
||||||
|
configuration = Release
|
||||||
|
|
||||||
[installer:task]
|
[installer:task]
|
||||||
enabled = false
|
enabled = false
|
||||||
@@ -84,39 +85,14 @@ force = false
|
|||||||
configure = true
|
configure = true
|
||||||
pull = true
|
pull = true
|
||||||
|
|
||||||
[prebuilt]
|
|
||||||
boost = true
|
|
||||||
lz4 = true
|
|
||||||
openssl = true
|
|
||||||
pyqt = true
|
|
||||||
python = true
|
|
||||||
|
|
||||||
[versions]
|
[versions]
|
||||||
vs = 17
|
vs = 17
|
||||||
vs_year = 2022
|
vs_year = 2022
|
||||||
vs_toolset = 14.3
|
vs_toolset = 14.3
|
||||||
sdk = 10.0.22621.0
|
sdk = 10.0.26100.0
|
||||||
sevenz = 24.05
|
pyqt = 6.11.0
|
||||||
boost = 1.85.0
|
qt = 6.11.1
|
||||||
boost_vs = 14.3
|
qt_vs = 2022
|
||||||
fmt = 10.2.1
|
|
||||||
gtest = main
|
|
||||||
libloot = 0.22.4
|
|
||||||
lz4 = v1.9.4
|
|
||||||
nmm = 0.71.2
|
|
||||||
openssl = 3.3.0
|
|
||||||
pyqt = 6.7.0
|
|
||||||
pyqt_builder = 1.16.2
|
|
||||||
pyqt_sip = 13.7.0
|
|
||||||
python = v3.12.3
|
|
||||||
pybind11 = v2.12.0
|
|
||||||
bzip2 = 1.0.8
|
|
||||||
sip = 6.8.3
|
|
||||||
spdlog = v1.14.1
|
|
||||||
qt = 6.7.0
|
|
||||||
qt_vs = 2019
|
|
||||||
zlib = v1.3.1
|
|
||||||
libbsarch = 0.0.9
|
|
||||||
usvfs = master
|
usvfs = master
|
||||||
explorerpp = 1.4.0
|
explorerpp = 1.4.0
|
||||||
ss_paper_lad_6788 = 7.2
|
ss_paper_lad_6788 = 7.2
|
||||||
@@ -129,16 +105,10 @@ ss_starfield_trosski = V1.11
|
|||||||
ss_fallout3_trosski = v1.11
|
ss_fallout3_trosski = v1.11
|
||||||
ss_fallout4_trosski = v1.11
|
ss_fallout4_trosski = v1.11
|
||||||
|
|
||||||
[build-types]
|
|
||||||
libbsarch = release
|
|
||||||
pyqt = release
|
|
||||||
python = release
|
|
||||||
|
|
||||||
[paths]
|
[paths]
|
||||||
third_party =
|
third_party =
|
||||||
prefix =
|
prefix =
|
||||||
cache =
|
cache =
|
||||||
patches =
|
|
||||||
licenses =
|
licenses =
|
||||||
build =
|
build =
|
||||||
install =
|
install =
|
||||||
@@ -147,13 +117,12 @@ install_installer =
|
|||||||
install_libs =
|
install_libs =
|
||||||
install_pdbs =
|
install_pdbs =
|
||||||
install_dlls =
|
install_dlls =
|
||||||
install_loot =
|
|
||||||
install_plugins =
|
install_plugins =
|
||||||
install_stylesheets =
|
install_stylesheets =
|
||||||
install_licenses =
|
install_licenses =
|
||||||
install_pythoncore =
|
|
||||||
install_translations =
|
install_translations =
|
||||||
vs =
|
vs =
|
||||||
|
vcpkg =
|
||||||
qt_install =
|
qt_install =
|
||||||
qt_bin =
|
qt_bin =
|
||||||
qt_translations =
|
qt_translations =
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
--- builder.py (date 1575938575861)
|
|
||||||
+++ builder.py (date 1575938575861)
|
|
||||||
@@ -402,17 +402,29 @@
|
|
||||||
'QMAKE_LFLAGS += -Wl,--version-script={}.exp'.format(
|
|
||||||
buildable.target))
|
|
||||||
|
|
||||||
- pro_lines.append(
|
|
||||||
+ if project.py_platform == 'win32':
|
|
||||||
+ for include_dir in project.py_include_dir.split(';'):
|
|
||||||
+ pro_lines.append(
|
|
||||||
+ 'INCLUDEPATH += {}'.format(
|
|
||||||
+ self.qmake_quote(include_dir)))
|
|
||||||
+ else:
|
|
||||||
+ pro_lines.append(
|
|
||||||
'INCLUDEPATH += {}'.format(
|
|
||||||
- self.qmake_quote(project.py_include_dir)))
|
|
||||||
+ self.qmake_quote(project.py_include_dir)))
|
|
||||||
|
|
||||||
+ if project.py_pylib_shlib != "":
|
|
||||||
+ pro_lines.append(
|
|
||||||
+ 'DEFINES += {}'.format(
|
|
||||||
+ self.qmake_quote("PYTHON_LIB=\"{}\"".format(
|
|
||||||
+ project.py_pylib_shlib))))
|
|
||||||
+
|
|
||||||
# Python.h on Windows seems to embed the need for pythonXY.lib, so tell
|
|
||||||
# it where it is.
|
|
||||||
# TODO: is this still necessary for Python v3.8?
|
|
||||||
if not buildable.static:
|
|
||||||
pro_lines.extend(['win32 {',
|
|
||||||
- ' LIBS += -L{}'.format(
|
|
||||||
- self.qmake_quote(project.py_pylib_dir)),
|
|
||||||
+ ' LIBS += -L{}{}'.format(
|
|
||||||
+ self.qmake_quote(project.py_pylib_dir), '' if project.py_pylib_lib == '' else ' -l' + project.py_pylib_lib),
|
|
||||||
'}'])
|
|
||||||
|
|
||||||
# Add any installables from the buildable
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
--- PCbuild/openssl.props (revision 5c02a39a0b31a330e06b4d6f44835afb205dc7cc)
|
|
||||||
+++ PCbuild/openssl.props (date 1575994670797)
|
|
||||||
@@ -13,6 +13,7 @@
|
|
||||||
<_DLLSuffix>-3</_DLLSuffix>
|
|
||||||
<_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
|
|
||||||
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
|
|
||||||
+ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64</_DLLSuffix>
|
|
||||||
<OpenSSLDLLSuffix Condition="$(OpenSSLDLLSuffix) == ''">$(_DLLSuffix)</OpenSSLDLLSuffix>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user