aboutsummaryrefslogtreecommitdiff
path: root/sdl
diff options
context:
space:
mode:
Diffstat (limited to 'sdl')
-rw-r--r--sdl/main.c4
-rw-r--r--sdl/unix/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/sdl/main.c b/sdl/main.c
index 5a103b4..f4bd752 100644
--- a/sdl/main.c
+++ b/sdl/main.c
@@ -9,8 +9,8 @@
#include "fmdriver/fmdriver.h"
#include "common/fmplayer_file.h"
#include "common/fmplayer_common.h"
+#include "common/fmplayer_fontrom.h"
#include "fft/fft.h"
-#include "fmdsp/fontrom_shinonome.inc"
bool loadgl(void);
@@ -160,7 +160,7 @@ int main(int argc, char **argv) {
return 1;
}
fmdsp_pacc_set(g.fp, &g.work, &g.opna, &g.fftin);
- fmdsp_font_from_font_rom(&g.font16, fmdsp_shinonome_font_rom);
+ fmplayer_font_rom_load(&g.font16);
fmdsp_pacc_set_font16(g.fp, &g.font16);
SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
diff --git a/sdl/unix/Makefile b/sdl/unix/Makefile
index 62dd177..274f40d 100644
--- a/sdl/unix/Makefile
+++ b/sdl/unix/Makefile
@@ -11,7 +11,7 @@ OBJS+=pacc-gl.o
OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_unix.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_unix.o fmplayer_drumrom_unix.o
+OBJS+=fmplayer_file.o fmplayer_work_opna.o fmplayer_file_unix.o fmplayer_drumrom_unix.o fmplayer_fontrom_unix.o
OBJS+=fft.o
TARGET:=fmplayersdl