From 6ae9afae1c16e1b398dcb1213f1c0810319f51b4 Mon Sep 17 00:00:00 2001 From: Jason Flatt Date: Wed, 16 Aug 2023 15:54:11 -0700 Subject: [PATCH] Remove configuration attempt, clean up patch file --- com.supermodel3.Supermodel.yaml | 7 +-- ldflags.patch | 81 ++++----------------------------- 2 files changed, 10 insertions(+), 78 deletions(-) diff --git a/com.supermodel3.Supermodel.yaml b/com.supermodel3.Supermodel.yaml index 7af7908..8141952 100644 --- a/com.supermodel3.Supermodel.yaml +++ b/com.supermodel3.Supermodel.yaml @@ -28,11 +28,8 @@ modules: - install -Dm 0644 ${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop - install -Dm 0644 ${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml - install -Dm 0644 supermodel128x128.png ${FLATPAK_DEST}/share/icons/hicolor/128x128/apps/${FLATPAK_ID}.png - - mkdir -p ${XDG_CONFIG_HOME}/.supermodel/NVRAM - - mkdir -p ${XDG_CONFIG_HOME}/.supermodel/ROMs - - mkdir -p ${XDG_CONFIG_HOME}/.supermodel/Saves - - cp -r Assets ${XDG_CONFIG_HOME}/.supermodel/ - - cp -r Config ${XDG_CONFIG_HOME}/.supermodel/ + - cp -r Assets ${FLATPAK_DEST}/bin/ + - cp -r Config ${FLATPAK_DEST}/bin/ sources: - type: git url: https://github.com/trzy/Supermodel.git diff --git a/ldflags.patch b/ldflags.patch index 15021bb..dd84a70 100644 --- a/ldflags.patch +++ b/ldflags.patch @@ -2,77 +2,12 @@ diff --git a/Makefiles/Makefile.UNIX b/Makefiles/Makefile.UNIX index 1e48361..1e7577d 100644 --- a/Makefiles/Makefile.UNIX +++ b/Makefiles/Makefile.UNIX -@@ -27,13 +27,13 @@ - - - ############################################################################### --# Build Options --############################################################################### -- --DELETE = rm -d -r -f -- -- --############################################################################### -+# Build Options -+############################################################################### -+ -+DELETE = rm -d -r -f -+ -+ -+############################################################################### - # Platform Configuration - # - # Edit library and include paths as needed. -@@ -53,29 +53,29 @@ LD = gcc - - # - # SDL --# -- --SDL2_CFLAGS = `sdl2-config --cflags` --SDL2_LIBS = `sdl2-config --libs` -- --# --# UNIX-specific --# -- --PLATFORM_CXXFLAGS = $(SDL2_CFLAGS) -O3 +@@ -63,7 +63,7 @@ SDL2_LIBS = `sdl2-config --libs` + # + + PLATFORM_CXXFLAGS = $(SDL2_CFLAGS) -O3 -PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net -- -- --############################################################################### --# Core Makefile --############################################################################### -+# -+ -+SDL2_CFLAGS = `sdl2-config --cflags` -+SDL2_LIBS = `sdl2-config --libs` -+ -+# -+# UNIX-specific -+# -+ -+PLATFORM_CXXFLAGS = $(SDL2_CFLAGS) -O3 -+PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net -L/app/lib -+ -+ -+############################################################################### -+# Core Makefile -+############################################################################### - - PLATFORM_SRC_FILES = \ - Src/OSD/Unix/FileSystemPath.cpp -- --include Makefiles/Rules.inc -- --clean: -- $(SILENT)echo Cleaning up \"$(BIN_DIR)\" and \"$(OBJ_DIR)\"... -- $(SILENT)$(DELETE) $(BIN_DIR) -- $(SILENT)$(DELETE) $(OBJ_DIR) -+ -+include Makefiles/Rules.inc -+ -+clean: -+ $(SILENT)echo Cleaning up \"$(BIN_DIR)\" and \"$(OBJ_DIR)\"... -+ $(SILENT)$(DELETE) $(BIN_DIR) -+ $(SILENT)$(DELETE) $(OBJ_DIR) ++PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net -L/app/lib + + + ###############################################################################