diff --git a/Makefile b/Makefile index 39b00e6..7a84811 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 $@ smw_assets.dat: @echo "Extracting game resources" diff --git a/src/platform/win32/smw.ico b/src/platform/win32/smw.ico new file mode 100644 index 0000000..5d81645 Binary files /dev/null and b/src/platform/win32/smw.ico differ diff --git a/src/platform/win32/smw.rc b/src/platform/win32/smw.rc index 580608d..e517ccc 100644 --- a/src/platform/win32/smw.rc +++ b/src/platform/win32/smw.rc @@ -27,7 +27,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 TEXTINCLUDE BEGIN - "platform\\win32\\resource.h\0" + "src\\platform\\win32\\resource.h\0" END 2 TEXTINCLUDE @@ -52,7 +52,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON1 ICON "platform\\win32\\triforce.ico" +IDI_ICON1 ICON "src\\platform\\win32\\smw.ico" #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////