diff --git a/Build_Android_Templates.bat b/Build_Android_Templates.bat index a78b4de..5d516d8 100644 --- a/Build_Android_Templates.bat +++ b/Build_Android_Templates.bat @@ -2,9 +2,9 @@ rem This Source Code Form is subject to the terms of the Mozilla Public License, cd ./engine -call scons -j6 platform=android target=release_debug android_arch=armv7 entities_2d=no -call scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=no -call scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=no +call scons -j6 platform=android target=release_debug android_arch=armv7 entities_2d=yes +call scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=yes +call scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=yes cd ./platform/android/java diff --git a/Build_Android_Templates_Release.bat b/Build_Android_Templates_Release.bat index 2b9cd95..87d1461 100644 --- a/Build_Android_Templates_Release.bat +++ b/Build_Android_Templates_Release.bat @@ -2,9 +2,9 @@ rem This Source Code Form is subject to the terms of the Mozilla Public License, cd ./engine -call scons -j6 platform=android target=release android_arch=armv7 entities_2d=no -call scons -j6 platform=android target=release android_arch=arm64v8 entities_2d=no -call scons -j6 platform=android target=release android_arch=x86 entities_2d=no +call scons -j6 platform=android target=release android_arch=armv7 entities_2d=yes +call scons -j6 platform=android target=release android_arch=arm64v8 entities_2d=yes +call scons -j6 platform=android target=release android_arch=x86 entities_2d=yes cd ./platform/android/java diff --git a/Build_JavaScript.bat b/Build_JavaScript.bat index d034c39..a156817 100644 --- a/Build_JavaScript.bat +++ b/Build_JavaScript.bat @@ -2,6 +2,6 @@ rem This Source Code Form is subject to the terms of the Mozilla Public License, cd ./engine -call scons -j2 platform=javascript tools=no target=release_debug entities_2d=no +call scons -j2 platform=javascript tools=no target=release_debug entities_2d=yes cd .. diff --git a/Build_WIndows_Templates_rel.bat b/Build_WIndows_Templates_rel.bat index 051f1ca..1853d7d 100644 --- a/Build_WIndows_Templates_rel.bat +++ b/Build_WIndows_Templates_rel.bat @@ -10,7 +10,7 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 ) -call scons -j6 platform=windows target=release tools=no entities_2d=no +call scons -j6 platform=windows target=release tools=no entities_2d=yes cd .. diff --git a/Build_Windows-Minimal.bat b/Build_Windows-Minimal.bat index 9fe06d2..06158ff 100644 --- a/Build_Windows-Minimal.bat +++ b/Build_Windows-Minimal.bat @@ -10,7 +10,7 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 ) -call scons -j6 platform=windows target=release_debug entities_2d=no javascript_eval=false module_arkit_enabled=no module_assimp_enabled=no module_csg_enabled=no module_gdnative_enabled=no module_opus_enabled=no module_webp_enabled=no module_webm_enabled=no module_visual_script_enabled=no module_xatlas_unwrap_enabled=no module_theora_enabled=no module_vhacd_enabled=no module_tinyexr_enabled=no module_squish_enabled=no module_gridmap_enabled=no +call scons -j6 platform=windows target=release_debug entities_2d=yes javascript_eval=false module_arkit_enabled=no module_assimp_enabled=no module_csg_enabled=no module_gdnative_enabled=no module_opus_enabled=no module_webp_enabled=no module_webm_enabled=no module_visual_script_enabled=no module_xatlas_unwrap_enabled=no module_theora_enabled=no module_vhacd_enabled=no module_tinyexr_enabled=no module_squish_enabled=no module_gridmap_enabled=no cd .. diff --git a/Build_Windows.bat b/Build_Windows.bat index 517ca28..60644f5 100644 --- a/Build_Windows.bat +++ b/Build_Windows.bat @@ -10,7 +10,7 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 ) -call scons -j6 platform=windows target=release_debug entities_2d=no +call scons -j6 platform=windows target=release_debug entities_2d=yes cd .. diff --git a/Build_Windows2.bat b/Build_Windows2.bat index 84d166f..88bb156 100644 --- a/Build_Windows2.bat +++ b/Build_Windows2.bat @@ -10,7 +10,7 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 ) -call scons -j3 platform=windows target=release_debug entities_2d=no +call scons -j3 platform=windows target=release_debug entities_2d=yes cd .. diff --git a/Build_Windows_Debug.bat b/Build_Windows_Debug.bat index 76e25de..4eacaaf 100644 --- a/Build_Windows_Debug.bat +++ b/Build_Windows_Debug.bat @@ -10,7 +10,7 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 ) -call scons -j6 platform=windows target=debug entities_2d=no +call scons -j6 platform=windows target=debug entities_2d=yes cd .. diff --git a/Build_Windows_MinGW.bat b/Build_Windows_MinGW.bat index d4343b4..ee25c32 100644 --- a/Build_Windows_MinGW.bat +++ b/Build_Windows_MinGW.bat @@ -6,7 +6,7 @@ cd ./engine rem scons -j6 platform=windows -call scons -j6 platform=windows target=release_debug entities_2d=no use_mingw=yes +call scons -j6 platform=windows target=release_debug entities_2d=yes use_mingw=yes cd .. diff --git a/Build_Windows_Templates.bat b/Build_Windows_Templates.bat index d57a978..5212423 100644 --- a/Build_Windows_Templates.bat +++ b/Build_Windows_Templates.bat @@ -10,7 +10,7 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 ) -call scons -j6 platform=windows target=release_debug tools=no entities_2d=no +call scons -j6 platform=windows target=release_debug tools=no entities_2d=yes cd .. diff --git a/Visual_Studio_Project.bat b/Visual_Studio_Project.bat index f04207d..6df23c8 100644 --- a/Visual_Studio_Project.bat +++ b/Visual_Studio_Project.bat @@ -6,4 +6,4 @@ cd ./engine rem scons -j6 platform=windows -"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 && scons -j6 p=windows target=release_debug vsproj=yes voxel_mem_tools=no entities_2d=no entity_mem_tools=no +"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 && scons -j6 p=windows target=release_debug vsproj=yes voxel_mem_tools=no entities_2d=yes entity_mem_tools=no diff --git a/build_android_templates.sh b/build_android_templates.sh index 5551653..4a833e9 100755 --- a/build_android_templates.sh +++ b/build_android_templates.sh @@ -8,9 +8,9 @@ export ANDROID_HOME=~/SDKs/Android/SDK cd ./engine -scons -j6 platform=android target=release_debug android_arch=armv7 entities_2d=no -scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=no -scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=no +scons -j6 platform=android target=release_debug android_arch=armv7 entities_2d=yes +scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=yes +scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=yes cd ./platform/android/java diff --git a/build_android_templates.sh~ b/build_android_templates.sh~ deleted file mode 100755 index 08fc2db..0000000 --- a/build_android_templates.sh~ +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -cd ./engine - -scons -j6 platform=android target=release_debug android_arch=armv7 entities_2d=no -scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=no -scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=no - -cd ./platform/android/java - -./gradlew generateGodotTemplates - -cd .. -cd .. -cd .. -cd .. diff --git a/build_android_templates_release.sh b/build_android_templates_release.sh index 332c141..bb2dfeb 100755 --- a/build_android_templates_release.sh +++ b/build_android_templates_release.sh @@ -8,9 +8,9 @@ export ANDROID_HOME=~/SDKs/Android/SDK cd ./engine -scons -j6 platform=android target=release android_arch=armv7 entities_2d=no -scons -j6 platform=android target=release android_arch=arm64v8 entities_2d=no -scons -j6 platform=android target=release android_arch=x86 entities_2d=no +scons -j6 platform=android target=release android_arch=armv7 entities_2d=yes +scons -j6 platform=android target=release android_arch=arm64v8 entities_2d=yes +scons -j6 platform=android target=release android_arch=x86 entities_2d=yes cd ./platform/android/java diff --git a/build_ios.sh b/build_ios.sh index 5ed515b..6fd5adf 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -5,8 +5,8 @@ export SCONS_CACHE_LIMIT=5000 cd ./engine -scons -j6 p=iphone tools=no target=release_debug arch=arm entities_2d=no module_arkit_enabled=no game_center=no -scons -j6 p=iphone tools=no target=release_debug arch=arm64 entities_2d=no module_arkit_enabled=no game_center=no +scons -j6 p=iphone tools=no target=release_debug arch=arm entities_2d=yes module_arkit_enabled=no game_center=no +scons -j6 p=iphone tools=no target=release_debug arch=arm64 entities_2d=yes module_arkit_enabled=no game_center=no lipo -create bin/libgodot.iphone.opt.debug.arm.a bin/libgodot.iphone.opt.debug.arm64.a -output bin/libgodot.iphone.debug.fat.a rm bin/ios_xcode/libgodot.iphone.debug.fat.a cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a diff --git a/build_ios_release.sh b/build_ios_release.sh index 744a938..f20b1a1 100755 --- a/build_ios_release.sh +++ b/build_ios_release.sh @@ -5,8 +5,8 @@ export SCONS_CACHE_LIMIT=5000 cd ./engine -scons -j6 p=iphone tools=no target=release arch=arm entities_2d=no module_arkit_enabled=no game_center=no -scons -j6 p=iphone tools=no target=release arch=arm64 entities_2d=no module_arkit_enabled=no game_center=no +scons -j6 p=iphone tools=no target=release arch=arm entities_2d=yes module_arkit_enabled=no game_center=no +scons -j6 p=iphone tools=no target=release arch=arm64 entities_2d=yes module_arkit_enabled=no game_center=no lipo -create bin/libgodot.iphone.opt.arm.a bin/libgodot.iphone.opt.arm64.a -output bin/libgodot.iphone.release.fat.a rm bin/ios_xcode/libgodot.iphone.release.fat.a cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a diff --git a/build_javascript_release.bat b/build_javascript_release.bat index 0c6422e..2d905f7 100644 --- a/build_javascript_release.bat +++ b/build_javascript_release.bat @@ -2,6 +2,6 @@ rem This Source Code Form is subject to the terms of the Mozilla Public License, cd ./engine -call scons -j6 platform=javascript tools=no target=release entities_2d=no +call scons -j6 platform=javascript tools=no target=release entities_2d=yes cd .. \ No newline at end of file diff --git a/build_linux.sh b/build_linux.sh index ea305db..0560ac5 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -4,7 +4,7 @@ export SCONS_CACHE=~/.scons_cache export SCONS_CACHE_LIMIT=5000 cd engine -scons -j2 platform=x11 target=release_debug entities_2d=no +scons -j2 platform=x11 target=release_debug entities_2d=yes # use_llvm=yes diff --git a/build_linux_j2.sh b/build_linux_j2.sh index ea305db..0560ac5 100644 --- a/build_linux_j2.sh +++ b/build_linux_j2.sh @@ -4,7 +4,7 @@ export SCONS_CACHE=~/.scons_cache export SCONS_CACHE_LIMIT=5000 cd engine -scons -j2 platform=x11 target=release_debug entities_2d=no +scons -j2 platform=x11 target=release_debug entities_2d=yes # use_llvm=yes diff --git a/build_linux_templates_release.sh b/build_linux_templates_release.sh index 8ebbea6..7a716e6 100755 --- a/build_linux_templates_release.sh +++ b/build_linux_templates_release.sh @@ -4,7 +4,7 @@ export SCONS_CACHE=~/.scons_cache export SCONS_CACHE_LIMIT=5000 cd engine -scons -j2 platform=x11 target=release_debug entities_2d=no tools=no +scons -j2 platform=x11 target=release_debug entities_2d=yes tools=no # use_llvm=yes diff --git a/build_osx.sh b/build_osx.sh index 1333b9a..e63a9c4 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -5,7 +5,7 @@ export SCONS_CACHE_LIMIT=5000 cd ./engine -scons -j6 platform=osx target=release_debug entities_2d=no +scons -j6 platform=osx target=release_debug entities_2d=yes rm -Rf bin/Godot.app cp -r misc/dist/osx_tools.app ./bin/Godot.app diff --git a/build_uwp.bat b/build_uwp.bat index 022799b..4b5b7ae 100644 --- a/build_uwp.bat +++ b/build_uwp.bat @@ -7,9 +7,9 @@ if not defined DevEnvDir ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 ) -call scons -j6 platform=uwp target=release entities_2d=no -rem call scons -j6 platform=uwp target=release_debug entities_2d=no -rem call scons -j6 platform=uwp target=release entities_2d=no +call scons -j6 platform=uwp target=release entities_2d=yes +rem call scons -j6 platform=uwp target=release_debug entities_2d=yes +rem call scons -j6 platform=uwp target=release entities_2d=yes cd ..