diff options
| author | Takamichi Horikawa <takamichiho@gmail.com> | 2018-10-29 22:00:34 +0900 |
|---|---|---|
| committer | Takamichi Horikawa <takamichiho@gmail.com> | 2018-10-29 22:00:34 +0900 |
| commit | df38031f493c0cdb35218fda566077103ee1a68e (patch) | |
| tree | 1a90f2dec0e9a3a6d195bfbca7b4a54958d639bf | |
| parent | 8f72d89b6c39e9f516fda8133db146b01bad4560 (diff) | |
fixed SDL OSX build
| -rw-r--r-- | common/fmplayer_file_unix.c | 4 | ||||
| -rw-r--r-- | sdl/.gitignore | 1 | ||||
| -rw-r--r-- | sdl/osx/.gitignore | 1 | ||||
| -rw-r--r-- | sdl/osx/Info.plist | 2 | ||||
| -rw-r--r-- | sdl/osx/Makefile | 12 |
5 files changed, 15 insertions, 5 deletions
diff --git a/common/fmplayer_file_unix.c b/common/fmplayer_file_unix.c index 88f1815..13d9450 100644 --- a/common/fmplayer_file_unix.c +++ b/common/fmplayer_file_unix.c @@ -7,7 +7,11 @@ #include <string.h> #include <strings.h> #include <iconv.h> +#ifdef __APPLE__ +#include <xlocale.h> +#else #include <locale.h> +#endif #include <langinfo.h> static void *fileread(const char *path, size_t maxsize, size_t *filesize, enum fmplayer_file_error *error) { diff --git a/sdl/.gitignore b/sdl/.gitignore new file mode 100644 index 0000000..fc5cf8f --- /dev/null +++ b/sdl/.gitignore @@ -0,0 +1 @@ +98fmplayersdl diff --git a/sdl/osx/.gitignore b/sdl/osx/.gitignore new file mode 100644 index 0000000..b275077 --- /dev/null +++ b/sdl/osx/.gitignore @@ -0,0 +1 @@ +98fmplayersdl.app diff --git a/sdl/osx/Info.plist b/sdl/osx/Info.plist index 4de59e7..ac36dce 100644 --- a/sdl/osx/Info.plist +++ b/sdl/osx/Info.plist @@ -6,6 +6,8 @@ <string>98fmplayersdl</string> <key>CFBundleIdentifier</key> <string>com.github.takamichih.98fmplayersdl</string> + <key>NSHighResolutionCapable</key> + <string>True</string> <key>CFBundleDocumentTypes</key> <array> <dict> diff --git a/sdl/osx/Makefile b/sdl/osx/Makefile index b04d76e..7cb67d9 100644 --- a/sdl/osx/Makefile +++ b/sdl/osx/Makefile @@ -5,31 +5,33 @@ vpath %.c ../../libopna vpath %.c ../../common vpath %.c ../../fmdriver vpath %.c ../../fft -XCRUN:=xcrun --sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/ +#XCRUN:=xcrun --sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/ +XCRUN:=xcrun CC:=$(XCRUN) cc OBJS:=main.o OBJS+=pacc-gl.o -OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_mach.o +OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_mach.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:=98fmplayersdl CFLAGS:=-Wall -Wextra -O2 -g +CFLAGS:=-DLIBOPNA_ENABLE_LEVELDATA CFLAGS+=-DPACC_GL_3 #CFLAGS+=-DPACC_GL_ES #CFLAGS+=-DPACC_GL_ES -DPACC_GL_3 CFLAGS+=-I. -I.. -I../.. SDLFW:=/Library/Frameworks/SDL2.framework CFLAGS+=-I$(SDLFW)/Headers -LIBS:=-framework SDL2 -framework OpenGL +LIBS:=-framework SDL2 -framework OpenGL -liconv LIBS+=-F/Library/Frameworks $(TARGET): $(OBJS) $(CC) -o $@ $^ $(LIBS) clean: - rm -f $(TARGET) $(OBJS) + rm -rf $(TARGET).app $(TARGET) $(OBJS) bundle: $(TARGET) rm -rf $(TARGET).app |