diff options
| author | Charadon <dev@iotib.net> | 2022-06-08 05:29:26 -0400 |
|---|---|---|
| committer | Charadon <dev@iotib.net> | 2022-06-08 05:29:26 -0400 |
| commit | 3e0948e5928e8b418cce21e8b13fd8fd21cad42e (patch) | |
| tree | 33fcb1643b27e3ef00442270376c01b0350d03ed | |
| parent | ca77aea516afa11c0767d63ef39e312ca190b861 (diff) | |
| download | Pong-C-3e0948e5928e8b418cce21e8b13fd8fd21cad42e.tar.gz | |
Fixed flatpak
| -rw-r--r-- | net.iotib.Pong.yml | 8 | ||||
| -rw-r--r-- | premake5.lua | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/net.iotib.Pong.yml b/net.iotib.Pong.yml index e974935..d591ad7 100644 --- a/net.iotib.Pong.yml +++ b/net.iotib.Pong.yml @@ -1,5 +1,5 @@ app-id: net.iotib.Pong -branch: '0.2' +branch: '0.3' appdata-license: 'GPL-3.0-only' runtime: org.freedesktop.Platform runtime-version: '21.08' @@ -15,9 +15,9 @@ modules: - mkdir -pv /app/lib - mkdir -pv /app/include - tar -xvf src/flatpak/raylib-4.0.0.tar.gz - - make -C raylib-4.0.0/src USE_EXTERNAL_GLFW=FALSE RAYLIB_LIBTYPE=SHARED ROOT=root DESTDIR=/app - - sed -i '/ldconfig/d' raylib-4.0.0/src/Makefile - - make -C raylib-4.0.0/src USE_EXTERNAL_GLFW=FALSE RAYLIB_LIBTYPE=SHARED ROOT=root DESTDIR=/app install + - cmake -B raylib-4.0.0/build -DUSE_EXTERNAL_GLFW=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DPLATFORM=Desktop -DCMAKE_INSTALL_PREFIX=/app raylib-4.0.0 + - make -C raylib-4.0.0/build + - make -C raylib-4.0.0/build install - make - install -Dvm755 bin/*/Pong /app/Pong/pong - install -Dvm755 src/flatpak/flatpak_launch.sh /app/bin/flatpak_launch.sh diff --git a/premake5.lua b/premake5.lua index 48469bc..5fcf892 100644 --- a/premake5.lua +++ b/premake5.lua @@ -119,9 +119,8 @@ project("Pong") if (flatpak == true) then - linkoptions {"-L/app/lib"} + else + buildoptions {"`pkgconf --cflags raylib`", "`pkgconf --cflags glfw3`", "`pkgconf --cflags gl`", "`pkgconf --cflags sdl2`", "`pkgconf --cflags SDL2_mixer`", "`pkgconf --cflags glu`"} + linkoptions {"`pkgconf --libs raylib`", "`pkgconf --libs glfw3`", "`pkgconf --libs gl`", "`pkgconf --libs sdl2`", "`pkgconf --libs SDL2_mixer`", "`pkgconf --libs glu`"} end - - - buildoptions {"`pkgconf --cflags raylib`", "`pkgconf --cflags glfw3`", "`pkgconf --cflags gl`", "`pkgconf --cflags sdl2`", "`pkgconf --cflags SDL2_mixer`", "`pkgconf --cflags glu`"} - linkoptions {"`pkgconf --libs raylib`", "`pkgconf --libs glfw3`", "`pkgconf --libs gl`", "`pkgconf --libs sdl2`", "`pkgconf --libs SDL2_mixer`", "`pkgconf --libs glu`"} + |