libretro/NP2kai
1
0
Fork 0
mirror of https://github.com/libretro/NP2kai.git synced 2024-10-07 14:53:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace libretro-common 53

Browse Source
This commit is contained in:
AZO234 2019-03-10 23:10:10 +09:00
parent 193661d32a
commit aaa185414e
5 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdl2/Makefile.libretro
View File

@ -467,10 +467,11 @@ LDFLAGS += -lws2_32 -luser32 -lwinmm -ladvapi32 -lshlwapi -lwsock32 -lws2_32 -lp
# Emscripten
else ifeq ($(platform),emscripten)
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
STATIC_LINKING = 1
PLATFORM_DEFINES += -DEMSCRIPTEN
PLATFORM_DEFINES += -DEMSCRIPTEN -I$(EMSCRIPTEN)/system/include
HAS_GCC = 0
# Windows MSVC 2010 x64
else ifeq ($(platform), windows_msvc2010_x64)
@ -788,16 +789,28 @@ all: $(TARGET)
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)
ifeq ($(platform), emscripten)
emcc $(LINKOUT)$@ $(OBJECTS)
else
$(AR) rcs $@ $(OBJECTS)
endif
else
$(LD) $(LINKOUT)$@ $(SHARED) $(OBJECTS) $(LDFLAGS) $(LIBS)
endif
%.o: %.cpp
$(CXX) $(CPPFLAGS) -c $(OBJOUT)$@ $< $(CXXFLAGS) $(INCDIRS)
ifeq ($(platform), emscripten)
em++ $(CPPFLAGS) -c $(OBJOUT)$@ $< $(CXXFLAGS) $(INCDIRS)
else
$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $< $(CXXFLAGS) $(INCDIRS)
endif
%.o: %.c
$(CC) $(CPPFLAGS) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCDIRS)
ifeq ($(platform), emscripten)
emcc $(CFLAGS) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCDIRS)
else
$(CC) $(CFLAGS) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCDIRS)
endif
clean-objs:
rm -f $(OBJECTS)

2
sdl2/cmmidi.c
View File

@ -15,6 +15,8 @@
#include <sys/time.h>
#endif
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
#include "sound/vermouth/vermouth.h"

2
sdl2/dosio.c
View File

@ -197,7 +197,7 @@ short file_dircreate(const char *path) {
short file_dirdelete(const char *path) {
#if !(defined(__LIBRETRO__) && defined(VITA))
#if !(defined(__LIBRETRO__) && (defined(VITA) || defined(EMSCRIPTEN)))
return((short)rmdir(path));
#endif
}

4
sdl2/scrnmng.c
View File

@ -830,7 +830,7 @@ void scrnmng_updatefsres(void) {
}
// transmit WAB display
void scrnmng_blthdc() {
void scrnmng_blthdc(void) {
#if defined(SUPPORT_WAB)
if (np2wabwnd.multiwindow) return;
if (mt_wabpausedrawing) return;
@ -853,7 +853,7 @@ void scrnmng_blthdc() {
#endif
}
void scrnmng_bltwab() {
void scrnmng_bltwab(void) {
#if defined(SUPPORT_WAB)
if (np2wabwnd.multiwindow) return;
#if defined(NP2_SDL2)

4
sdl2/scrnmng.h
View File

@ -57,5 +57,9 @@ typedef struct {
BRESULT scrnmng_entermenu(SCRNMENU *smenu);
void scrnmng_leavemenu(void);
void scrnmng_menudraw(const RECT_T *rct);
void scrnmng_update(void);
void scrnmng_updatecursor(void);
void scrnmng_updatefsres(void);
void scrnmng_blthdc(void);
void scrnmng_bltwab(void);