Skip to content

Commit

Permalink
Enable Atlas map editor
Browse files Browse the repository at this point in the history
Fixes #13
  • Loading branch information
Alexander-Wilms committed Apr 11, 2021
1 parent b61cc60 commit 586dc65
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "shared-modules"]
path = shared-modules
url = https://github.com/flathub/shared-modules
34 changes: 30 additions & 4 deletions com.play0ad.zeroad.yaml
Expand Up @@ -5,12 +5,14 @@ sdk: org.freedesktop.Sdk
sdk-extensions: [org.freedesktop.Sdk.Extension.rust-stable]
command: 0ad
finish-args:
- --socket=wayland
# wxWidgets doesn't work yet on Wayland
#- --socket=wayland
- --socket=fallback-x11
- --device=shm
- --share=ipc
- --device=dri
- --socket=pulseaudio
- --share=network
- --socket=x11
- --share=ipc
cleanup:
- /include
- /lib/pkgconfig
Expand Down Expand Up @@ -103,14 +105,38 @@ modules:
url: https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz
sha256: f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e

# Required so we can use wxWidgets with openGL integration
- shared-modules/glu/glu-9.json

- name: wxWidgets
rm-configure: true
config-opts:
- --with-gtk=3
- --with-opengl
build-options:
cxxflags: -std=c++11
sources:
- type: archive
url: https://github.com/wxWidgets/wxWidgets/archive/v3.1.3.tar.gz
sha256: a5cb5ea326d76b5e472e9400933cef17c900d5c9b549e40eef00b64fe86d7cb0
x-checker-data:
type: anitya
project-id: 5150
url-template: https://github.com/wxWidgets/wxWidgets/archive/v$version.tar.gz
- type: script
dest-filename: autogen.sh
commands:
- cp -p /usr/share/automake-*/config.{sub,guess} .
- autoconf -f -B build/autoconf_prepend-include

- name: 0ad
buildsystem: simple
build-options:
append-path: /usr/lib/sdk/rust-stable/bin
build-commands:
- cp cargo.patch libraries/source/spidermonkey/
- echo "patch -p1 < ../cargo.patch" >> libraries/source/spidermonkey/patch.sh
- cd build/workspaces && ./update-workspaces.sh -j$FLATPAK_BUILDER_N_JOBS --disable-atlas
- cd build/workspaces && ./update-workspaces.sh -j$FLATPAK_BUILDER_N_JOBS
--bindir=/app/bin --libdir=/app/lib --datadir=/app/share/games/0ad/ && cd
gcc && make -j$FLATPAK_BUILDER_N_JOBS
post-install:
Expand Down
1 change: 1 addition & 0 deletions shared-modules
Submodule shared-modules added at b0d4c0

0 comments on commit 586dc65

Please sign in to comment.