Remove configuration attempt, clean up patch file

This commit is contained in:
Jason Flatt 2023-08-16 15:54:11 -07:00
parent 5e033de1f8
commit 6ae9afae1c
2 changed files with 10 additions and 78 deletions

View file

@ -28,11 +28,8 @@ modules:
- install -Dm 0644 ${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop - 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 ${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 - install -Dm 0644 supermodel128x128.png ${FLATPAK_DEST}/share/icons/hicolor/128x128/apps/${FLATPAK_ID}.png
- mkdir -p ${XDG_CONFIG_HOME}/.supermodel/NVRAM - cp -r Assets ${FLATPAK_DEST}/bin/
- mkdir -p ${XDG_CONFIG_HOME}/.supermodel/ROMs - cp -r Config ${FLATPAK_DEST}/bin/
- mkdir -p ${XDG_CONFIG_HOME}/.supermodel/Saves
- cp -r Assets ${XDG_CONFIG_HOME}/.supermodel/
- cp -r Config ${XDG_CONFIG_HOME}/.supermodel/
sources: sources:
- type: git - type: git
url: https://github.com/trzy/Supermodel.git url: https://github.com/trzy/Supermodel.git

View file

@ -2,77 +2,12 @@ diff --git a/Makefiles/Makefile.UNIX b/Makefiles/Makefile.UNIX
index 1e48361..1e7577d 100644 index 1e48361..1e7577d 100644
--- a/Makefiles/Makefile.UNIX --- a/Makefiles/Makefile.UNIX
+++ b/Makefiles/Makefile.UNIX +++ b/Makefiles/Makefile.UNIX
@@ -27,13 +27,13 @@ @@ -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
+PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net -L/app/lib
############################################################################### ###############################################################################
-# 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
-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)