mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-05 10:16:54 +08:00
Disable D3D12 on Windows Godot builds instead of installing SDK
This commit is contained in:
parent
0fa873e3d9
commit
1bebcb514e
@ -64,9 +64,8 @@ pushd ../godot
|
|||||||
if [ "$platform" = "windows" ]; then
|
if [ "$platform" = "windows" ]; then
|
||||||
# --- Windows ---
|
# --- Windows ---
|
||||||
#generates windows_64_debug.exe and windows_64_release.exe
|
#generates windows_64_debug.exe and windows_64_release.exe
|
||||||
python misc/scripts/install_d3d12_sdk_windows.py
|
scons platform=windows tools=no target=template_release d3d12=no custom_modules="../spine_godot" $mono_module --jobs=$cpus
|
||||||
scons platform=windows tools=no target=template_release custom_modules="../spine_godot" $mono_module --jobs=$cpus
|
scons platform=windows tools=no target=template_debug d3d12=no custom_modules="../spine_godot" $mono_module --jobs=$cpus
|
||||||
scons platform=windows tools=no target=template_debug custom_modules="../spine_godot" $mono_module --jobs=$cpus
|
|
||||||
cp bin/godot.windows.template_release.x86_64$mono_extension.exe bin/windows_release_x86_64.exe
|
cp bin/godot.windows.template_release.x86_64$mono_extension.exe bin/windows_release_x86_64.exe
|
||||||
cp bin/godot.windows.template_debug.x86_64$mono_extension.exe bin/windows_debug_x86_64.exe
|
cp bin/godot.windows.template_debug.x86_64$mono_extension.exe bin/windows_debug_x86_64.exe
|
||||||
|
|
||||||
|
|||||||
@ -52,7 +52,7 @@ cpus=2
|
|||||||
if [ "$OSTYPE" == "msys" ]; then
|
if [ "$OSTYPE" == "msys" ]; then
|
||||||
os="windows"
|
os="windows"
|
||||||
cpus=$NUMBER_OF_PROCESSORS
|
cpus=$NUMBER_OF_PROCESSORS
|
||||||
target="$target"
|
target="$target d3d12=no"
|
||||||
godot_exe="godot.windows.editor$dev_extension.x86_64$mono_extension.exe"
|
godot_exe="godot.windows.editor$dev_extension.x86_64$mono_extension.exe"
|
||||||
godot_exe_host=$godot_exe
|
godot_exe_host=$godot_exe
|
||||||
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
@ -74,9 +74,6 @@ fi
|
|||||||
echo "CPUS: $cpus"
|
echo "CPUS: $cpus"
|
||||||
|
|
||||||
pushd ../godot
|
pushd ../godot
|
||||||
if [ "$os" == "windows" ]; then
|
|
||||||
python misc/scripts/install_d3d12_sdk_windows.py
|
|
||||||
fi
|
|
||||||
if [ "$os" == "macos" ] && [ $dev == "false" ]; then
|
if [ "$os" == "macos" ] && [ $dev == "false" ]; then
|
||||||
scons $target $mono_module arch=x86_64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
|
scons $target $mono_module arch=x86_64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
|
||||||
scons $target $mono_module arch=arm64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
|
scons $target $mono_module arch=arm64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user