Compare commits

...

2 Commits

Author SHA1 Message Date
James Turner
089bcff15f Don’t wipe dist when building, since we need it
OpenSceneGraph is copied into dist, don’t blank it.
2017-11-17 14:27:14 +00:00
Torsten Dreyer
01913242b0 set correct release-branch for submodules 2017-09-17 12:14:09 +02:00
2 changed files with 4 additions and 5 deletions

8
.gitmodules vendored
View File

@ -1,11 +1,11 @@
[submodule "simgear"] [submodule "simgear"]
path = simgear path = simgear
url = https://git.code.sf.net/p/flightgear/simgear url = https://git.code.sf.net/p/flightgear/simgear
branch = next branch = release/2017.3
[submodule "flightgear"] [submodule "flightgear"]
path = flightgear path = flightgear
url = https://git.code.sf.net/p/flightgear/flightgear url = https://git.code.sf.net/p/flightgear/flightgear
branch = next branch = release/2017.3
[submodule "fgrun"] [submodule "fgrun"]
path = fgrun path = fgrun
url = https://git.code.sf.net/p/flightgear/fgrun url = https://git.code.sf.net/p/flightgear/fgrun
@ -13,7 +13,7 @@
[submodule "fgdata"] [submodule "fgdata"]
path = fgdata path = fgdata
url = git://git.code.sf.net/p/flightgear/fgdata url = git://git.code.sf.net/p/flightgear/fgdata
branch = next branch = release/2017.3
[submodule "windows-3rd-party"] [submodule "windows-3rd-party"]
path = windows-3rd-party path = windows-3rd-party
url = https://git.code.sf.net/p/flightgear/windows-3rd-party url = https://git.code.sf.net/p/flightgear/windows-3rd-party
@ -21,4 +21,4 @@
[submodule "getstart"] [submodule "getstart"]
path = getstart path = getstart
url = https://git.code.sf.net/p/flightgear/getstart url = https://git.code.sf.net/p/flightgear/getstart
branch = next branch = release/2017.3

View File

@ -14,7 +14,6 @@ mkdir -p sgBuild
mkdir -p fgBuild mkdir -p fgBuild
mkdir -p output mkdir -p output
rm -rf output/* rm -rf output/*
rm -rf dist/*
##################################################################################### #####################################################################################
echo "Starting on SimGear" echo "Starting on SimGear"