From e8fd09abf68b944b05554c82adb577514cad5ca5 Mon Sep 17 00:00:00 2001
From: Takamichi Horikawa <takamichiho@gmail.com>
Date: Wed, 18 Jan 2017 23:37:07 +0900
Subject: improve FMDSP and enable title display on win32

---
 win32/x86/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'win32/x86')

diff --git a/win32/x86/Makefile b/win32/x86/Makefile
index e273569..e5aad93 100644
--- a/win32/x86/Makefile
+++ b/win32/x86/Makefile
@@ -4,6 +4,8 @@ vpath %.c ../../libopna
 vpath %.c ../../fmdsp
 vpath %.rc ..
 TARGET=fmplayer.exe
+ICON=../fmplayer.ico
+ICONFILES=../fmplayer.png ../fmplayer32.png
 FMDRIVER_OBJS=fmdriver_fmp.o \
               ppz8.o
 LIBOPNA_OBJS=opna.o \
@@ -12,8 +14,8 @@ LIBOPNA_OBJS=opna.o \
              opnassg.o \
              opnadrum.o \
              opnaadpcm.o
-FMDSP_OBJS=fmdsp.o
-OBJS=main.o dsoundout.o soundout.o waveout.o uc.o lnf.o \
+FMDSP_OBJS=fmdsp.o font_rom.o
+OBJS=main.o dsoundout.o soundout.o waveout.o uc.o lnf.o winfont.o \
      $(FMDRIVER_OBJS) \
      $(LIBOPNA_OBJS) \
      $(FMDSP_OBJS)
@@ -36,8 +38,11 @@ $(TARGET):	$(OBJS)
 	$(CC) -o $@ $(OBJS) $(LIBS)
 	$(STRIP) $@
 
-%.o:	%.rc
+%.o:	%.rc $(ICON)
 	$(WINDRES) -o $@ -i $<
 
+$(ICON):	$(ICONFILES)
+	convert $(ICONFILES) -colors 256 $@
+
 clean:
 	rm -f $(TARGET) $(OBJS)
-- 
cgit v1.2.3