Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,27 +1,15 @@
[submodule "Resources/Binary"]
path = Resources/Binary
url = https://github.com/OoliteProject/oolite-binary-resources.git
[submodule "Mac-specific"]
path = Mac-specific
url = https://github.com/OoliteProject/oolite-mac-components
[submodule "deps/Linux-deps"]
path = deps/Linux-deps
url = https://github.com/OoliteProject/oolite-linux-dependencies.git
[submodule "tests"]
path = tests
url = https://github.com/OoliteProject/oolite-tests.git
[submodule "deps/Cross-platform-deps"]
path = deps/Cross-platform-deps
url = https://github.com/OoliteProject/oolite-sdl-dependencies.git
[submodule "deps/mozilla"]
path = deps/mozilla
url = https://github.com/OoliteProject/spidermonkey-ff4.git
[submodule "deps/libogg"]
path = deps/libogg
url = https://github.com/OoliteProject/libogg-1.3.0.git
[submodule "deps/libvorbis"]
path = deps/libvorbis
url = https://github.com/OoliteProject/libvorbis-1.3.3.git
[submodule "deps/Windows-deps"]
path = deps/Windows-deps
url = https://github.com/OoliteProject/oolite-windows-dependencies.git
12 changes: 0 additions & 12 deletions .relative_gitmodules
Original file line number Diff line number Diff line change
@@ -1,27 +1,15 @@
[submodule "Resources/Binary"]
path = Resources/Binary
url = ../oolite-binary-resources.git
[submodule "Mac-specific"]
path = Mac-specific
url = ../oolite-mac-components
[submodule "deps/Linux-deps"]
path = deps/Linux-deps
url = ../oolite-linux-dependencies.git
[submodule "tests"]
path = tests
url = ../oolite-tests.git
[submodule "deps/Cross-platform-deps"]
path = deps/Cross-platform-deps
url = ../oolite-sdl-dependencies.git
[submodule "deps/mozilla"]
path = deps/mozilla
url = ../spidermonkey-ff4.git
[submodule "deps/libogg"]
path = deps/libogg
url = ../libogg-1.3.0.git
[submodule "deps/libvorbis"]
path = deps/libvorbis
url = ../libvorbis-1.3.3.git
[submodule "deps/Windows-deps"]
path = deps/Windows-deps
url = ../oolite-windows-dependencies.git
2 changes: 1 addition & 1 deletion Documentation/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.

INPUT = ApiDocIntro.dox ../../src ../../Mac-specific/Oolite-importer ../../Mac-specific/Oolite-docktile ../../Mac-specific/DebugBundle/Source ../../Mac-specific/DataFormatters
INPUT = ApiDocIntro.dox ../../src

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down
1 change: 0 additions & 1 deletion Mac-specific
Submodule Mac-specific deleted from 90eb95
2 changes: 1 addition & 1 deletion deps/Linux-deps
1 change: 0 additions & 1 deletion deps/libogg
Submodule libogg deleted from d68b71
1 change: 0 additions & 1 deletion deps/libvorbis
Submodule libvorbis deleted from 219ba5
16 changes: 8 additions & 8 deletions installers/flatpak/space.oolite.Oolite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ modules:
sources:
- type: git
url: https://github.com/gnustep/libobjc2.git
commit: e5c06e3be8895007bcc7be58cbeccac2a5a89eff
commit: 62e3a80b8e93818c2ac3250beab211c4d294cc87
- name: gnustep-make
build-options:
env:
Expand All @@ -69,9 +69,9 @@ modules:
- --with-library-combo=ng-gnu-gnu
- --with-runtime-abi=gnustep-2.2
sources:
- type: archive
url: "https://github.com/gnustep/tools-make/releases/download/make-2_9_3/gnustep-make-2.9.3.tar.gz"
sha256: "93ca320b706279ebca53760da89d4c3f2bbc547f4723967140a34346d9f04c24"
- type: git
url: https://github.com/gnustep/tools-make.git
commit: 50cf9619e672fb2ff6825f239b5a172c5dc55630
- name: gnustep-base
build-options:
env:
Expand All @@ -80,16 +80,16 @@ modules:
sources:
- type: git
url: https://github.com/gnustep/libs-base.git
commit: 2b236ec2c4816e7ff482f07dc973b655a3780122
commit: caa0816846937a0ad4724eba12cd0d69786b2e54
- name: oolite
buildsystem: simple
build-commands:
- source installers/flatpak/flatpak_build.sh
- source installers/flatpak/flatpak_build.sh
sources:
# Update tag and commit for FlatHub release. For CI and local builds, create_flatpak.sh replaces git source with:
# - type: dir
# path: ../
- type: git
url: https://github.com/OoliteProject/oolite.git
tag: "1.92.0.3"
commit: d2a705b05f667e9aa4d18478ff9305dac9183a9a
tag: "1.92.1.0"
commit: dd117d31c2f0e756d478e64584120d3d5cbf64d8
1 change: 0 additions & 1 deletion tests
Submodule tests deleted from ef000a
Loading