From 1cb2364d85f122b37e79eb953769c86717b6c24a Mon Sep 17 00:00:00 2001 From: impeeza <41979604+impeeza@users.noreply.github.com> Date: Mon, 4 Sep 2023 23:40:23 -0500 Subject: [PATCH 1/2] Update Makefile Add Icon to EXE file. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b251d6c..0c993e0 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ CFLAGS:=${CFLAGS} $(shell sdl2-config --cflags) -DSYSTEM_VOLUME_MIXER_AVAILABLE= ifeq (${OS},Windows_NT) WINDRES:=windres -# RES:=sm.res + RES:=smw.res SDLFLAGS:=-Wl,-Bstatic $(shell sdl2-config --static-libs) else SDLFLAGS:=$(shell sdl2-config --libs) -lm @@ -24,9 +24,9 @@ $(TARGET_EXEC): $(OBJS) $(RES) %.o : %.c $(CC) -c $(CFLAGS) $< -o $@ -#$(RES): src/platform/win32/smw.rc -# @echo "Generating Windows resources" -# @$(WINDRES) $< -O coff -o $@ +$(RES): src/platform/win32/smw.rc + @echo "Generating Windows resources" + @$(WINDRES) $< -O coff -o $@ clean: clean_obj clean_obj: From 278e2ddec2eaa655ff637c0534f1f771bc901529 Mon Sep 17 00:00:00 2001 From: impeeza <41979604+impeeza@users.noreply.github.com> Date: Wed, 13 Sep 2023 22:22:46 -0500 Subject: [PATCH 2/2] Update Makefile Typo on proposed change. --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0c993e0..7a84811 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TARGET_EXEC:=smw -SRCS:=$(wildcard src/*.c src/snes/*.c) third_party/gl_core/gl_core_3_1.c +SRCS:=$(wildcard smb1/*.c smbll/*.c src/*.c src/snes/*.c) third_party/gl_core/gl_core_3_1.c OBJS:=$(SRCS:%.c=%.o) PYTHON:=/usr/bin/env python3 @@ -17,7 +17,7 @@ endif .PHONY: all clean clean_obj -all: $(TARGET_EXEC) +all: $(TARGET_EXEC) smw_assets.dat $(TARGET_EXEC): $(OBJS) $(RES) $(CC) $^ -o $@ $(LDFLAGS) $(SDLFLAGS) @@ -28,6 +28,13 @@ $(RES): src/platform/win32/smw.rc @echo "Generating Windows resources" @$(WINDRES) $< -O coff -o $@ -clean: clean_obj +smw_assets.dat: + @echo "Extracting game resources" + $(PYTHON) assets/restool.py + +clean: clean_obj clean_gen clean_obj: @$(RM) $(OBJS) $(TARGET_EXEC) +clean_gen: + @$(RM) $(RES) smw_assets.dat + @rm -rf assets/__pycache__