diff --git a/Build_Android_Templates.bat b/Build_Android_Templates.bat index 1d6056a0..79161787 100644 --- a/Build_Android_Templates.bat +++ b/Build_Android_Templates.bat @@ -1,9 +1,9 @@ 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 +call scons -j6 platform=android target=release_debug android_arch=arm64v8 +call scons -j6 platform=android target=release_debug android_arch=x86 cd ./platform/android/java diff --git a/Build_Android_Templates_Release.bat b/Build_Android_Templates_Release.bat index 64782681..7e2676d6 100644 --- a/Build_Android_Templates_Release.bat +++ b/Build_Android_Templates_Release.bat @@ -1,9 +1,9 @@ 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 +call scons -j6 platform=android target=release android_arch=arm64v8 +call scons -j6 platform=android target=release android_arch=x86 cd ./platform/android/java diff --git a/Build_JavaScript.bat b/Build_JavaScript.bat index 2833a829..b37c7a52 100644 --- a/Build_JavaScript.bat +++ b/Build_JavaScript.bat @@ -1,6 +1,6 @@ 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 cd .. diff --git a/Build_WIndows_Templates_rel.bat b/Build_WIndows_Templates_rel.bat index c2c09695..e1a41a44 100644 --- a/Build_WIndows_Templates_rel.bat +++ b/Build_WIndows_Templates_rel.bat @@ -9,7 +9,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 cd .. diff --git a/Build_Windows-Minimal.bat b/Build_Windows-Minimal.bat index a7383452..915ac3ef 100644 --- a/Build_Windows-Minimal.bat +++ b/Build_Windows-Minimal.bat @@ -9,7 +9,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 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 f552d650..4343d7e5 100644 --- a/Build_Windows.bat +++ b/Build_Windows.bat @@ -9,7 +9,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 cd .. diff --git a/Build_Windows2.bat b/Build_Windows2.bat index 8605dfc1..42f5e391 100644 --- a/Build_Windows2.bat +++ b/Build_Windows2.bat @@ -9,7 +9,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 cd .. diff --git a/Build_Windows_Debug.bat b/Build_Windows_Debug.bat index e108fca3..058b9980 100644 --- a/Build_Windows_Debug.bat +++ b/Build_Windows_Debug.bat @@ -9,7 +9,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 cd .. diff --git a/Build_Windows_MinGW.bat b/Build_Windows_MinGW.bat index 849463e7..e7981375 100644 --- a/Build_Windows_MinGW.bat +++ b/Build_Windows_MinGW.bat @@ -5,7 +5,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 use_mingw=yes cd .. diff --git a/Build_Windows_Templates.bat b/Build_Windows_Templates.bat index 63c37fc6..8712153c 100644 --- a/Build_Windows_Templates.bat +++ b/Build_Windows_Templates.bat @@ -9,7 +9,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 cd .. diff --git a/EngineSetup.bat b/EngineSetup.bat deleted file mode 100644 index 248de663..00000000 --- a/EngineSetup.bat +++ /dev/null @@ -1,121 +0,0 @@ -@echo off - -IF NOT EXIST ./engine ( - git clone https://github.com/godotengine/godot.git ./engine -) ELSE ( - cd engine - - rmdir /s /q modules - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -IF EXIST ./modules GOTO DONE - mkdir modules -:DONE - -cd modules - -IF NOT EXIST ./fastnoise ( - git clone https://github.com/Relintai/godot_fastnoise.git fastnoise -) ELSE ( - cd fastnoise - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -xcopy "fastnoise" "../engine/modules/fastnoise" /e /i /h /y - -IF NOT EXIST ./ui_extensions ( - git clone https://github.com/Relintai/ui_extensions.git ui_extensions -) ELSE ( - cd ui_extensions - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -xcopy "ui_extensions" "../engine/modules/ui_extensions" /e /i /h /y - -IF NOT EXIST ./entity_spell_system ( - git clone https://github.com/Relintai/entity_spell_system.git entity_spell_system -) ELSE ( - cd entity_spell_system - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -xcopy "entity_spell_system" "../engine/modules/entity_spell_system" /e /i /h /y - - -IF NOT EXIST ./voxelman ( - git clone https://github.com/Relintai/voxelman.git voxelman -) ELSE ( - cd voxelman - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -xcopy "voxelman" "../engine/modules/voxelman" /e /i /h /y - - -IF NOT EXIST ./world_generator ( - git clone https://github.com/Relintai/world_generator.git world_generator -) ELSE ( - cd world_generator - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -xcopy "world_generator" "../engine/modules/world_generator" /e /i /h /y - - - -IF NOT EXIST ./texture_packer ( - git clone https://github.com/Relintai/texture_packer.git texture_packer -) ELSE ( - cd texture_packer - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -) - -xcopy "texture_packer" "../engine/modules/texture_packer" /e /i /h /y - - -cd .. - -pause diff --git a/Visual_Studio_Project.bat b/Visual_Studio_Project.bat index 87720884..c67dc852 100644 --- a/Visual_Studio_Project.bat +++ b/Visual_Studio_Project.bat @@ -5,4 +5,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 entity_mem_tools=no diff --git a/build_android_templates.sh b/build_android_templates.sh index 00b4f6d4..f8711ffd 100755 --- a/build_android_templates.sh +++ b/build_android_templates.sh @@ -6,9 +6,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 +scons -j6 platform=android target=release_debug android_arch=arm64v8 +scons -j6 platform=android target=release_debug android_arch=x86 cd ./platform/android/java diff --git a/build_android_templates_release.sh b/build_android_templates_release.sh index d4d7f1cf..b893bde0 100755 --- a/build_android_templates_release.sh +++ b/build_android_templates_release.sh @@ -6,9 +6,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 +scons -j6 platform=android target=release android_arch=arm64v8 +scons -j6 platform=android target=release android_arch=x86 cd ./platform/android/java diff --git a/build_ios.sh b/build_ios.sh index c3c6d816..6d287a44 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -4,8 +4,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 module_arkit_enabled=no game_center=no +scons -j6 p=iphone tools=no target=release_debug arch=arm64 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 79f11c51..f5d83035 100755 --- a/build_ios_release.sh +++ b/build_ios_release.sh @@ -4,8 +4,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 module_arkit_enabled=no game_center=no +scons -j6 p=iphone tools=no target=release arch=arm64 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 7e89e9e8..abfd1143 100644 --- a/build_javascript_release.bat +++ b/build_javascript_release.bat @@ -1,6 +1,6 @@ cd ./engine -call scons -j6 platform=javascript tools=no target=release entities_2d=no +call scons -j6 platform=javascript tools=no target=release cd .. \ No newline at end of file diff --git a/build_linux.sh b/build_linux.sh index e086cf7a..844baf99 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -3,7 +3,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 # use_llvm=yes diff --git a/build_linux_j2.sh b/build_linux_j2.sh index e086cf7a..2fc88ae8 100644 --- a/build_linux_j2.sh +++ b/build_linux_j2.sh @@ -3,7 +3,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 # use_llvm=yes diff --git a/build_linux_templates_release.sh b/build_linux_templates_release.sh index 0ec69639..050765ca 100755 --- a/build_linux_templates_release.sh +++ b/build_linux_templates_release.sh @@ -3,7 +3,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 tools=no # use_llvm=yes diff --git a/build_osx.sh b/build_osx.sh index 141614e2..fab5d0d5 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -4,7 +4,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 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 3df22e07..fde96588 100644 --- a/build_uwp.bat +++ b/build_uwp.bat @@ -6,9 +6,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 +rem call scons -j6 platform=uwp target=release_debug +rem call scons -j6 platform=uwp target=release cd .. diff --git a/engine_setup.sh b/engine_setup.sh deleted file mode 100755 index b6018c68..00000000 --- a/engine_setup.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -if [ ! -d engine ]; then - git clone https://github.com/godotengine/godot.git ./engine -else - cd engine - - rm -Rf modules - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. -fi - -if [ ! -d modules ]; then - mkdir modules -fi - -cd modules - -if [ ! -d fastnoise ]; then - git clone https://github.com/Relintai/godot_fastnoise.git ./fastnoise - cp -R ./fastnoise ../engine/modules/fastnoise -else - cd fastnoise - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. - - cp -R ./fastnoise ../engine/modules/fastnoise -fi - -if [ ! -d ui_extensions ]; then - git clone git@github.com:Relintai/ui_extensions.git ui_extensions - cp -R ./ui_extensions ../engine/modules/ui_extensions -else - cd ui_extensions - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. - - cp -R ./ui_extensions ../engine/modules/ui_extensions -fi - -if [ ! -d entity_spell_system ]; then - git clone git@github.com:Relintai/entity_spell_system.git entity_spell_system - cp -R ./entity_spell_system ../engine/modules/entity_spell_system -else - cd entity_spell_system - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. - - cp -R ./entity_spell_system ../engine/modules/entity_spell_system -fi - -if [ ! -d voxelman ]; then - git clone git@github.com:Relintai/voxelman.git voxelman - cp -R ./voxelman ../engine/modules/voxelman -else - cd voxelman - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. - - cp -R ./voxelman ../engine/modules/voxelman -fi - -if [ ! -d world_generator ]; then - git clone git@github.com:Relintai/world_generator.git world_generator - cp -R ./world_generator ../engine/modules/world_generator -else - cd world_generator - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. - - cp -R ./world_generator ../engine/modules/world_generator -fi - -if [ ! -d texture_packer ]; then - git clone git@github.com:Relintai/texture_packer.git texture_packer - cp -R ./texture_packer ../engine/modules/texture_packer -else - cd texture_packer - - git reset --hard - git pull origin master - git checkout master - git reset --hard - - cd .. - - cp -R ./texture_packer ../engine/modules/texture_packer -fi -