mirror of
https://github.com/libretro/vice-libretro.git
synced 2026-11-07 11:16:00 -10:00
libretro: build fixes for updated libretro-common
This commit is contained in:
1 parent
3096eb0a59
commit
27685d8d32
5 files changed
+15
-3
No files matched your search
@@ -146,6 +146,7 @@ else ifeq ($(platform), libnx)
|
||||
CXXFLAGS += $(CFLAGS)
|
||||
fpic = -fPIE
|
||||
STATIC_LINKING=1
|
||||
COMMONFLAGS += -DNEED_STRCASESTR
|
||||
|
||||
# OSX
|
||||
else ifeq ($(platform), osx)
|
||||
@@ -315,6 +316,7 @@ else ifeq ($(platform), emscripten)
|
||||
SHARED := -shared -s TOTAL_MEMORY=67108864
|
||||
STATIC_LINKING = 1
|
||||
COMMONFLAGS += -DHAVE_TIME_T_IN_TIME_H
|
||||
COMMONFLAGS += -DNEED_STRCASESTR
|
||||
|
||||
# Wii
|
||||
else ifeq ($(platform), wii)
|
||||
@@ -393,11 +395,17 @@ else ifeq ($(platform), wincross64)
|
||||
# Windows
|
||||
else
|
||||
CFLAGS += -D__WIN32__
|
||||
COMMONFLAGS += -DNEED_STRCASESTR
|
||||
TARGET := $(TARGET_NAME)_libretro.dll
|
||||
LDFLAGS += --shared -static-libgcc -static-libstdc++ -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--gc-sections -L/usr/x86_64-w64-mingw32/lib
|
||||
LDFLAGS += -lws2_32 -luser32 -lwinmm -ladvapi32 -lshlwapi -lwsock32 -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -lmingw32 -shared -lgcc -lm -lmingw32
|
||||
endif
|
||||
|
||||
# webOS
|
||||
ifneq (,$(or $(findstring webos,$(CROSS_COMPILE)),$(findstring starfish,$(CROSS_COMPILE))))
|
||||
CFLAGS += -D_GNU_SOURCE
|
||||
endif
|
||||
|
||||
# Common
|
||||
ifeq ($(DEBUG), 1)
|
||||
COMMONFLAGS += -O0 -g
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@ RETRODEP = $(CORE_DIR)/retrodep
|
||||
LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
|
||||
|
||||
INCFLAGS += \
|
||||
-I$(EMU) \
|
||||
-I$(CORE_DIR) \
|
||||
-I$(CORE_DIR)/libretro \
|
||||
-I$(CORE_DIR)/include \
|
||||
@@ -13,7 +14,7 @@ INCFLAGS += \
|
||||
-I$(EMU)/printerdrv \
|
||||
-I$(RETRODEP) \
|
||||
-I$(LIBRETRO_COMM_DIR)/include \
|
||||
-I$(LIBRETRO_COMM_DIR)/include/compat/zlib
|
||||
-I$(DEPS_DIR)/libz
|
||||
|
||||
CXXFLAGS += $(CPPFLAGS)
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -168,7 +168,7 @@
|
||||
#define MODE_COPY 1 /* copy input directly */
|
||||
#define MODE_GZIP 2 /* decompress a gzip stream */
|
||||
|
||||
#include "gzfile.h"
|
||||
//#include "gzfile.h"
|
||||
|
||||
/* internal gzip file state data structure */
|
||||
typedef struct {
|
||||
|
||||
Vendored
-1
@@ -4,7 +4,6 @@
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "zutil.h"
|
||||
#include "inftrees.h"
|
||||
#include "inflate.h"
|
||||
|
||||
@@ -421,4 +421,8 @@ struct vice_core_option_info
|
||||
|
||||
#define DISK_IMAGE_TYPE_FS 0xFFFF
|
||||
|
||||
#ifdef NEED_STRCASESTR
|
||||
#define strcasestr compat_strcasestr
|
||||
#endif
|
||||
|
||||
#endif /* LIBRETRO_CORE_H */
|
||||
Reference in new issue
Block a user