aboutsummaryrefslogtreecommitdiff
path: root/sdl/win
diff options
context:
space:
mode:
authorTakamichi Horikawa <takamichiho@gmail.com>2017-12-27 09:42:44 +0900
committerTakamichi Horikawa <takamichiho@gmail.com>2017-12-27 09:42:44 +0900
commit6775ab6c61b65e44d05eca4ffae488d9147ee31f (patch)
treecf7733196eeed3c66692b683cbbfedd86ba442ab /sdl/win
parent89dea5438266ef3389e5e86310d778c64bb6b59c (diff)
parent00f1d8d6cacf48139b976f3a25c040d51e1abe74 (diff)
merge sdl fix
Diffstat (limited to 'sdl/win')
-rw-r--r--sdl/win/Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/sdl/win/Makefile b/sdl/win/Makefile
index 0f63d19..74ddf0e 100644
--- a/sdl/win/Makefile
+++ b/sdl/win/Makefile
@@ -5,18 +5,21 @@ vpath %.c ../../libopna
vpath %.c ../../common
vpath %.c ../../fmdriver
vpath %.c ../../fft
-SDLCONFIG:=i686-w64-mingw32-sdl2-config
-CC:=i686-w64-mingw32-gcc
+#ARCH=x86_64
+ARCH=i686
+SDLCONFIG:=$(ARCH)-w64-mingw32-sdl2-config
+CC:=$(ARCH)-w64-mingw32-gcc
OBJS:=main.o
OBJS+=pacc-gl.o
-OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_win.o
+OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_win.o font_rom.o
OBJS+=opna.o opnafm.o opnassg.o opnadrum.o opnaadpcm.o opnatimer.o opnassg-sinc-c.o opnassg-sinc-sse2.o
OBJS+=fmdriver_pmd.o fmdriver_fmp.o ppz8.o fmdriver_common.o
-OBJS+=fmplayer_file.o fmplayer_work_opna.o fmplayer_file_win.o fmplayer_drumrom_win.o
+OBJS+=fmplayer_file.o fmplayer_work_opna.o fmplayer_file_win.o fmplayer_drumrom_win.o fmplayer_fontrom_win.o winfont.o
OBJS+=fft.o
TARGET:=fmplayersdl.exe
CFLAGS:=-Wall -Wextra -O2
+CFLAGS+=-DLIBOPNA_ENABLE_LEVELDATA
CFLAGS+=-DFMPLAYER_FILE_WIN_UTF8
CFLAGS+=-DPACC_GL_3
#CFLAGS+=-DPACC_GL_ES