mirror of
https://github.com/RetroDECK/com.supermodel3.Supermodel.git
synced 2025-04-10 19:15:15 +00:00
Merge branch 'flathub:master' into master
Some checks failed
Build Artifacts for RetroDECK / Building (push) Has been cancelled
Some checks failed
Build Artifacts for RetroDECK / Building (push) Has been cancelled
This commit is contained in:
commit
a2b212e949
|
|
@ -1,6 +1,6 @@
|
|||
id: com.supermodel3.Supermodel
|
||||
runtime: org.freedesktop.Platform
|
||||
runtime-version: "23.08"
|
||||
runtime-version: "24.08"
|
||||
sdk: org.freedesktop.Sdk
|
||||
command: supermodel
|
||||
separate-locales: false
|
||||
|
|
@ -11,7 +11,6 @@ finish-args:
|
|||
- --filesystem=host:ro
|
||||
- --share=network
|
||||
- --share=ipc
|
||||
- --socket=x11
|
||||
- --socket=fallback-x11
|
||||
- --socket=pulseaudio
|
||||
- --socket=wayland
|
||||
|
|
@ -35,7 +34,7 @@ modules:
|
|||
sources:
|
||||
- type: git
|
||||
url: https://github.com/trzy/Supermodel.git
|
||||
commit: a2645c944f57e8d9c245063d21f9bf612eab0a6b
|
||||
commit: d043dc0c6a99f5fff87d7044e85a608508eae7e1
|
||||
- type: file
|
||||
path: com.supermodel3.Supermodel.desktop
|
||||
- type: file
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
diff --git a/Makefiles/Makefile.UNIX b/Makefiles/Makefile.UNIX
|
||||
index 1e48361..1e7577d 100644
|
||||
index 2c4c341..84aaed0 100644
|
||||
--- a/Makefiles/Makefile.UNIX
|
||||
+++ b/Makefiles/Makefile.UNIX
|
||||
@@ -63,7 +63,7 @@ SDL2_LIBS = `sdl2-config --libs`
|
||||
@@ -72,7 +72,7 @@ endif
|
||||
#
|
||||
|
||||
PLATFORM_CXXFLAGS = $(SDL2_CFLAGS) -O3
|
||||
-PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net
|
||||
+PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net -L/app/lib
|
||||
-PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread
|
||||
+PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -L/app/lib
|
||||
|
||||
|
||||
###############################################################################
|
||||
|
|
|
|||
Loading…
Reference in a new issue