FGFS-4.1/fgmeta
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: FGFS-4.1:next
Branches Tags
FGFS-4.1:next
FGFS-4.1:release/2020.3
FGFS-4.1:release/2020.2
FGFS-4.1:release/2018.3
FGFS-4.1:release/2020.1
FGFS-4.1:topics/catalina-args-debug
FGFS-4.1:release/2019.1
FGFS-4.1:next-gen/vulkan
FGFS-4.1:topics/remove-plib
FGFS-4.1:release/2018.2
FGFS-4.1:release/2018.1
FGFS-4.1:release/2017.3
FGFS-4.1:release/2017.2
FGFS-4.1:release/2017.1
FGFS-4.1:release/2016.4
FGFS-4.1:release/2016.3
FGFS-4.1:release/2016.2
FGFS-4.1:release/2016.1
FGFS-4.1:release/3.6.0
FGFS-4.1:release/3.4.0
FGFS-4.1:release/3.2.0
FGFS-4.1:master
FGFS-4.1:release/3.0.0
FGFS-4.1:release/2.12.0
FGFS-4.1:release/2.10.0
FGFS-4.1:release/pre-2.10.0
FGFS-4.1:release/2.8.0
FGFS-4.1:release/2.6.0
FGFS-4.1:release/2.4.0
FGFS-4.1:releases/2.2.0
FGFS-4.1:releases/fake1.5
FGFS-4.1:version/2020.3.18
FGFS-4.1:version/2020.3.17
FGFS-4.1:version/2020.3.16
FGFS-4.1:version/2020.3.15
FGFS-4.1:version/2020.3.14
FGFS-4.1:version/2020.3.13
FGFS-4.1:version/2020.3.12
FGFS-4.1:version/2020.3.11
FGFS-4.1:version/2020.3.10
FGFS-4.1:version/2020.3.9
FGFS-4.1:version/2020.3.8
FGFS-4.1:version/2020.3.7
FGFS-4.1:version/2020.3.6
FGFS-4.1:version/2020.3.5
FGFS-4.1:version/2020.3.4
FGFS-4.1:version/2020.3.3
FGFS-4.1:version/2020.3.2
FGFS-4.1:version/2020.3.1
FGFS-4.1:version/2018.3.6
FGFS-4.1:version/2020.1.3
FGFS-4.1:version/2020.1.2
FGFS-4.1:version/2018.3.5
FGFS-4.1:version/2019.1.2
FGFS-4.1:version/2018.3.4
FGFS-4.1:version/2018.3.3
FGFS-4.1:version/2018.2.1
FGFS-4.1:version/2018.3.0
FGFS-4.1:version/2018.2.0
FGFS-4.1:version/2018.1.1
FGFS-4.1:version/2017.4.0
FGFS-4.1:version/2017.3.1
FGFS-4.1:version/2017.3.0
FGFS-4.1:version/2017.2.1
FGFS-4.1:version/2017.1.2
FGFS-4.1:version/2017.1.1
FGFS-4.1:version/2017.2.0
FGFS-4.1:version/2016.4.4
FGFS-4.1:version/2016.4.3
FGFS-4.1:version/2016.4.1
FGFS-4.1:version/2017.1.0
FGFS-4.1:version/2016.3.1
FGFS-4.1:version/2016.4.0
FGFS-4.1:version/2016.2.1
FGFS-4.1:version/2016.3.0
FGFS-4.1:version/2016.1.2
FGFS-4.1:version/2016.2.0
FGFS-4.1:version/2016.1.1
FGFS-4.1:version/2.6.0-final
FGFS-4.1:version/2.6.0
FGFS-4.1:version/2.4.0-final
...
pull from: FGFS-4.1:release/2016.4
Branches Tags
FGFS-4.1:next
FGFS-4.1:release/2020.3
FGFS-4.1:release/2020.2
FGFS-4.1:release/2018.3
FGFS-4.1:release/2020.1
FGFS-4.1:topics/catalina-args-debug
FGFS-4.1:release/2019.1
FGFS-4.1:next-gen/vulkan
FGFS-4.1:topics/remove-plib
FGFS-4.1:release/2018.2
FGFS-4.1:release/2018.1
FGFS-4.1:release/2017.3
FGFS-4.1:release/2017.2
FGFS-4.1:release/2017.1
FGFS-4.1:release/2016.4
FGFS-4.1:release/2016.3
FGFS-4.1:release/2016.2
FGFS-4.1:release/2016.1
FGFS-4.1:release/3.6.0
FGFS-4.1:release/3.4.0
FGFS-4.1:release/3.2.0
FGFS-4.1:master
FGFS-4.1:release/3.0.0
FGFS-4.1:release/2.12.0
FGFS-4.1:release/2.10.0
FGFS-4.1:release/pre-2.10.0
FGFS-4.1:release/2.8.0
FGFS-4.1:release/2.6.0
FGFS-4.1:release/2.4.0
FGFS-4.1:releases/2.2.0
FGFS-4.1:releases/fake1.5
FGFS-4.1:version/2020.3.18
FGFS-4.1:version/2020.3.17
FGFS-4.1:version/2020.3.16
FGFS-4.1:version/2020.3.15
FGFS-4.1:version/2020.3.14
FGFS-4.1:version/2020.3.13
FGFS-4.1:version/2020.3.12
FGFS-4.1:version/2020.3.11
FGFS-4.1:version/2020.3.10
FGFS-4.1:version/2020.3.9
FGFS-4.1:version/2020.3.8
FGFS-4.1:version/2020.3.7
FGFS-4.1:version/2020.3.6
FGFS-4.1:version/2020.3.5
FGFS-4.1:version/2020.3.4
FGFS-4.1:version/2020.3.3
FGFS-4.1:version/2020.3.2
FGFS-4.1:version/2020.3.1
FGFS-4.1:version/2018.3.6
FGFS-4.1:version/2020.1.3
FGFS-4.1:version/2020.1.2
FGFS-4.1:version/2018.3.5
FGFS-4.1:version/2019.1.2
FGFS-4.1:version/2018.3.4
FGFS-4.1:version/2018.3.3
FGFS-4.1:version/2018.2.1
FGFS-4.1:version/2018.3.0
FGFS-4.1:version/2018.2.0
FGFS-4.1:version/2018.1.1
FGFS-4.1:version/2017.4.0
FGFS-4.1:version/2017.3.1
FGFS-4.1:version/2017.3.0
FGFS-4.1:version/2017.2.1
FGFS-4.1:version/2017.1.2
FGFS-4.1:version/2017.1.1
FGFS-4.1:version/2017.2.0
FGFS-4.1:version/2016.4.4
FGFS-4.1:version/2016.4.3
FGFS-4.1:version/2016.4.1
FGFS-4.1:version/2017.1.0
FGFS-4.1:version/2016.3.1
FGFS-4.1:version/2016.4.0
FGFS-4.1:version/2016.2.1
FGFS-4.1:version/2016.3.0
FGFS-4.1:version/2016.1.2
FGFS-4.1:version/2016.2.0
FGFS-4.1:version/2016.1.1
FGFS-4.1:version/2.6.0-final
FGFS-4.1:version/2.6.0
FGFS-4.1:version/2.4.0-final

7 Commits
next ... release/20

Author SHA1 Message Date
Automatic Release Builder
25c9516a46 update submodule heads 2016-12-28 14:00:37 +01:00
Automatic Release Builder
2428ee5846 new version: 2016.4.4 2016-12-28 13:58:32 +01:00
Automatic Release Builder
c579c1bf9d new version: 2016.4.3 2016-12-05 13:31:46 +01:00
Automatic Release Builder
6f16e81aba new version: 2016.4.2 2016-11-22 09:49:15 +01:00
James Turner
418cf6820e Update submodule heads. 2016-11-21 23:16:06 +00:00
Torsten Dreyer
1ac4ed1f57 Remove locale folder from install 
After removal of fgrun, this folder does not exist anymore
 2016-11-18 08:52:27 +01:00
Automatic Release Builder
0d1777684d set correct release-branch for submodules 2016-11-17 13:43:39 +01:00
7 changed files with 12 additions and 10 deletions
Show Stats Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,11 +1,11 @@
[submodule "simgear"] [submodule "simgear"]
path = simgear path = simgear
url = git://git.code.sf.net/p/flightgear/simgear url = git://git.code.sf.net/p/flightgear/simgear
branch = next branch = release/2016.4
[submodule "flightgear"] [submodule "flightgear"]
path = flightgear path = flightgear
url = git://git.code.sf.net/p/flightgear/flightgear url = git://git.code.sf.net/p/flightgear/flightgear
branch = next branch = release/2016.4
[submodule "fgrun"] [submodule "fgrun"]
path = fgrun path = fgrun
url = git://git.code.sf.net/p/flightgear/fgrun url = git://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/2016.4
[submodule "windows-3rd-party"] [submodule "windows-3rd-party"]
path = windows-3rd-party path = windows-3rd-party
url = git://git.code.sf.net/p/flightgear/windows-3rd-party url = git://git.code.sf.net/p/flightgear/windows-3rd-party

6
FlightGear.iss
View File

@ -82,7 +82,8 @@ Name: "insoal"; Description: "Install OpenAL (the sound engine)"
; 32 bits install ; 32 bits install
Source: "{#InstallDir32}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode Source: "{#InstallDir32}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode ;locale only exists for fgrun - which has been disabled
;Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
Source: "{#ThirdPartyDir}\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
Source: "{#ThirdPartyDir}\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
@ -96,7 +97,8 @@ Source: "{#VCInstallDir}\redist\x86\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}
; 64 bits install ; 64 bits install
Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode ;locale only exists for fgrun - which has been disabled
;Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode

2
fgdata

@ -1 +1 @@
Subproject commit e24a663a2acb2e75804341753209e169c64f3a1d Subproject commit a2e9da76040fed76d6752eaa3f4036385cd2656f

2
flightgear

@ -1 +1 @@
Subproject commit 89d7cd9ef93c1653f46797713c460edb7bf3223f Subproject commit 6f36cd89b76d357cbd4eedebe42cef62fcc473ac

2
simgear

@ -1 +1 @@
Subproject commit 6e5cbd7fc55f23b2fdb1d935438c11805c8e7042 Subproject commit 235e38b69b0e03db53a2476702c7defadc0f4714

2
version
View File

@ -1 +1 @@
2016.4.1 2016.4.4

2
windows-3rd-party

@ -1 +1 @@
Subproject commit 527969ffe10e2d20a9cdad52a37f7e6d4c7bf0ed Subproject commit 5b231bc794105f824f74d35554d63299533850d3