mirror of
https://github.com/godotengine/godot-cpp.git
synced 2026-01-01 05:48:37 +03:00
Compare commits
8 Commits
godot-3.4.
...
3.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ee24cebdc | ||
|
|
51a5eb76a2 | ||
|
|
a2b2e101f8 | ||
|
|
d935a381dc | ||
|
|
c44c2e26d5 | ||
|
|
07f096f2f4 | ||
|
|
36fc84dae7 | ||
|
|
ff32433c1c |
30
.github/workflows/ci.yml
vendored
30
.github/workflows/ci.yml
vendored
@@ -4,15 +4,15 @@ on: [push, pull_request]
|
||||
jobs:
|
||||
linux:
|
||||
name: Build (Linux, GCC)
|
||||
runs-on: ubuntu-18.04
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Set up Python (for SCons)
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
@@ -29,7 +29,7 @@ jobs:
|
||||
scons target=release generate_bindings=yes -j $(nproc)
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: godot-cpp-linux-glibc2.27-x86_64-release
|
||||
path: bin/libgodot-cpp.linux.release.64.a
|
||||
@@ -48,12 +48,12 @@ jobs:
|
||||
runs-on: windows-2019
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Set up Python (for SCons)
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
@@ -66,7 +66,7 @@ jobs:
|
||||
scons target=release generate_bindings=yes -j $env:NUMBER_OF_PROCESSORS
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: godot-cpp-windows-msvc2019-x86_64-release
|
||||
path: bin/libgodot-cpp.windows.release.64.lib
|
||||
@@ -77,12 +77,12 @@ jobs:
|
||||
runs-on: windows-2019
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Set up Python (for SCons)
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
@@ -92,13 +92,15 @@ jobs:
|
||||
|
||||
- name: Setup MinGW for Windows/MinGW build
|
||||
uses: egor-tensin/setup-mingw@v2
|
||||
with:
|
||||
version: 12.2.0
|
||||
|
||||
- name: Build godot-cpp
|
||||
run: |
|
||||
scons target=release generate_bindings=yes use_mingw=yes -j $env:NUMBER_OF_PROCESSORS
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: godot-cpp-linux-mingw-x86_64-release
|
||||
path: bin/libgodot-cpp.windows.release.64.a
|
||||
@@ -109,12 +111,12 @@ jobs:
|
||||
runs-on: macos-11
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Set up Python (for SCons)
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
@@ -129,7 +131,7 @@ jobs:
|
||||
scons target=release generate_bindings=yes -j $(sysctl -n hw.logicalcpu)
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: godot-cpp-macos-universal-release
|
||||
path: bin/libgodot-cpp.osx.release.64.a
|
||||
@@ -148,7 +150,7 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Make apt sources.list use the default Ubuntu repositories
|
||||
run: |
|
||||
|
||||
17
SConstruct
17
SConstruct
@@ -146,6 +146,13 @@ opts.Add(BoolVariable("generate_template_get_node", "Generate a template version
|
||||
opts.Update(env)
|
||||
Help(opts.GenerateHelpText(env))
|
||||
|
||||
# Detect and print a warning listing unknown SCons variables to ease troubleshooting.
|
||||
unknown = opts.UnknownVariables()
|
||||
if unknown:
|
||||
print("WARNING: Unknown SCons variables were passed and will be ignored:")
|
||||
for item in unknown.items():
|
||||
print(" " + item[0] + "=" + item[1])
|
||||
|
||||
# This makes sure to keep the session environment variables on Windows.
|
||||
# This way, you can run SCons in a Visual Studio 2017 prompt and it will find
|
||||
# all the required tools
|
||||
@@ -369,11 +376,11 @@ elif env["platform"] == "android":
|
||||
# Setup tools
|
||||
env["CC"] = toolchain + "/bin/clang"
|
||||
env["CXX"] = toolchain + "/bin/clang++"
|
||||
env["AR"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ar"
|
||||
env["AS"] = toolchain + "/bin/" + arch_info["tool_path"] + "-as"
|
||||
env["LD"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ld"
|
||||
env["STRIP"] = toolchain + "/bin/" + arch_info["tool_path"] + "-strip"
|
||||
env["RANLIB"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ranlib"
|
||||
env["AR"] = toolchain + "/bin/llvm-ar"
|
||||
env["AS"] = toolchain + "/bin/llvm-as"
|
||||
env["LD"] = toolchain + "/bin/llvm-ld"
|
||||
env["STRIP"] = toolchain + "/bin/llvm-strip"
|
||||
env["RANLIB"] = toolchain + "/bin/llvm-ranlib"
|
||||
|
||||
env.Append(
|
||||
CCFLAGS=["--target=" + arch_info["target"] + env["android_api_level"], "-march=" + arch_info["march"], "-fPIC"]
|
||||
|
||||
Submodule godot-headers updated: 4ea4d82618...df0514f159
Reference in New Issue
Block a user