Removed the 2d build option from the scripts. Also removed the old setup scripts.

This commit is contained in:
Relintai 2020-01-02 23:11:26 +01:00
parent 382749220c
commit 46252eb2df
23 changed files with 33 additions and 273 deletions

View File

@ -1,9 +1,9 @@
cd ./engine 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=armv7
call scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=no call scons -j6 platform=android target=release_debug android_arch=arm64v8
call scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=no call scons -j6 platform=android target=release_debug android_arch=x86
cd ./platform/android/java cd ./platform/android/java

View File

@ -1,9 +1,9 @@
cd ./engine cd ./engine
call scons -j6 platform=android target=release android_arch=armv7 entities_2d=no call scons -j6 platform=android target=release android_arch=armv7
call scons -j6 platform=android target=release android_arch=arm64v8 entities_2d=no call scons -j6 platform=android target=release android_arch=arm64v8
call scons -j6 platform=android target=release android_arch=x86 entities_2d=no call scons -j6 platform=android target=release android_arch=x86
cd ./platform/android/java cd ./platform/android/java

View File

@ -1,6 +1,6 @@
cd ./engine 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 .. cd ..

View File

@ -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 "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 .. cd ..

View File

@ -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 "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 .. cd ..

View File

@ -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 "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 .. cd ..

View File

@ -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 "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 .. cd ..

View File

@ -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 "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 .. cd ..

View File

@ -5,7 +5,7 @@ cd ./engine
rem scons -j6 platform=windows 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 .. cd ..

View File

@ -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 "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 .. cd ..

View File

@ -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

View File

@ -5,4 +5,4 @@ cd ./engine
rem scons -j6 platform=windows 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

View File

@ -6,9 +6,9 @@ export ANDROID_HOME=~/SDKs/Android/SDK
cd ./engine cd ./engine
scons -j6 platform=android target=release_debug android_arch=armv7 entities_2d=no scons -j6 platform=android target=release_debug android_arch=armv7
scons -j6 platform=android target=release_debug android_arch=arm64v8 entities_2d=no scons -j6 platform=android target=release_debug android_arch=arm64v8
scons -j6 platform=android target=release_debug android_arch=x86 entities_2d=no scons -j6 platform=android target=release_debug android_arch=x86
cd ./platform/android/java cd ./platform/android/java

View File

@ -6,9 +6,9 @@ export ANDROID_HOME=~/SDKs/Android/SDK
cd ./engine cd ./engine
scons -j6 platform=android target=release android_arch=armv7 entities_2d=no scons -j6 platform=android target=release android_arch=armv7
scons -j6 platform=android target=release android_arch=arm64v8 entities_2d=no scons -j6 platform=android target=release android_arch=arm64v8
scons -j6 platform=android target=release android_arch=x86 entities_2d=no scons -j6 platform=android target=release android_arch=x86
cd ./platform/android/java cd ./platform/android/java

View File

@ -4,8 +4,8 @@ export SCONS_CACHE_LIMIT=5000
cd ./engine 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=arm 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=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 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 rm bin/ios_xcode/libgodot.iphone.debug.fat.a
cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a

View File

@ -4,8 +4,8 @@ export SCONS_CACHE_LIMIT=5000
cd ./engine 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=arm 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=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 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 rm bin/ios_xcode/libgodot.iphone.release.fat.a
cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a

View File

@ -1,6 +1,6 @@
cd ./engine cd ./engine
call scons -j6 platform=javascript tools=no target=release entities_2d=no call scons -j6 platform=javascript tools=no target=release
cd .. cd ..

View File

@ -3,7 +3,7 @@ export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000 export SCONS_CACHE_LIMIT=5000
cd engine cd engine
scons -j2 platform=x11 target=release_debug entities_2d=no scons -j2 platform=x11 target=release_debug
# use_llvm=yes # use_llvm=yes

View File

@ -3,7 +3,7 @@ export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000 export SCONS_CACHE_LIMIT=5000
cd engine cd engine
scons -j2 platform=x11 target=release_debug entities_2d=no scons -j2 platform=x11 target=release_debug
# use_llvm=yes # use_llvm=yes

View File

@ -3,7 +3,7 @@ export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000 export SCONS_CACHE_LIMIT=5000
cd engine 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 # use_llvm=yes

View File

@ -4,7 +4,7 @@ export SCONS_CACHE_LIMIT=5000
cd ./engine cd ./engine
scons -j6 platform=osx target=release_debug entities_2d=no scons -j6 platform=osx target=release_debug
rm -Rf bin/Godot.app rm -Rf bin/Godot.app
cp -r misc/dist/osx_tools.app ./bin/Godot.app cp -r misc/dist/osx_tools.app ./bin/Godot.app

View File

@ -6,9 +6,9 @@ if not defined DevEnvDir (
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
) )
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 entities_2d=no rem call scons -j6 platform=uwp target=release_debug
rem call scons -j6 platform=uwp target=release entities_2d=no rem call scons -j6 platform=uwp target=release
cd .. cd ..

View File

@ -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