RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-04 23:07:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libretro, fix handling of zlib

Browse source
This commit is contained in:
kub 2020-12-05 15:12:32 +01:00
parent 9511ffd153
commit 5735f2badf
2 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -169,7 +169,7 @@ OBJS += platform/libretro/libretro-common/streams/file_stream.o
OBJS += platform/libretro/libretro-common/streams/file_stream_transforms.o OBJS += platform/libretro/libretro-common/streams/file_stream_transforms.o
OBJS += platform/libretro/libretro-common/vfs/vfs_implementation.o OBJS += platform/libretro/libretro-common/vfs/vfs_implementation.o
endif endif
PLATFORM_ZLIB = 1 PLATFORM_ZLIB ?= 1
endif endif
ifeq "$(USE_FRONTEND)" "1" ifeq "$(USE_FRONTEND)" "1"

14
Makefile.libretro
View file

@ -54,7 +54,6 @@ ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.$(EXT) TARGET := $(TARGET_NAME)_libretro.$(EXT)
fpic := -fPIC fpic := -fPIC
SHARED := -shared SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
ifneq ($(findstring SunOS,$(shell uname -a)),) ifneq ($(findstring SunOS,$(shell uname -a)),)
CC=gcc CC=gcc
@ -67,7 +66,6 @@ else ifeq ($(platform), linux-portable)
SHARED := -shared -nostdlib SHARED := -shared -nostdlib
fpic := -fPIC fpic := -fPIC
LIBM := LIBM :=
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
# OS X # OS X
@ -162,7 +160,6 @@ else ifeq ($(platform), ps3)
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
# sncps3 # sncps3
else ifeq ($(platform), sncps3) else ifeq ($(platform), sncps3)
@ -173,7 +170,6 @@ else ifeq ($(platform), sncps3)
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
# Lightweight PS3 Homebrew SDK # Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght) else ifeq ($(platform), psl1ght)
@ -183,7 +179,6 @@ else ifeq ($(platform), psl1ght)
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
# PSP # PSP
else ifeq ($(platform), psp1) else ifeq ($(platform), psp1)
@ -194,7 +189,6 @@ else ifeq ($(platform), psp1)
CFLAGS += -DPSP CFLAGS += -DPSP
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
asm_render = 1 asm_render = 1
@ -208,7 +202,6 @@ else ifeq ($(platform), ps2)
CFLAGS += -DHAVE_NO_LANGEXTRA CFLAGS += -DHAVE_NO_LANGEXTRA
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
asm_render = 1 asm_render = 1
OBJS += platform/ps2/asm.o OBJS += platform/ps2/asm.o
@ -225,7 +218,6 @@ else ifeq ($(platform), ctr)
CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -fomit-frame-pointer -ffast-math
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
OBJS += platform/libretro/3ds/3ds_utils.o platform/libretro/3ds/utils.o OBJS += platform/libretro/3ds/3ds_utils.o platform/libretro/3ds/utils.o
@ -238,7 +230,6 @@ else ifeq ($(platform), raspberrypi)
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
SHARED := -shared SHARED := -shared
fpic := -fPIC fpic := -fPIC
DONT_COMPILE_IN_ZLIB = 1
# Vita # Vita
else ifeq ($(platform), vita) else ifeq ($(platform), vita)
@ -252,7 +243,6 @@ else ifeq ($(platform), vita)
CFLAGS += -fno-optimize-sibling-calls CFLAGS += -fno-optimize-sibling-calls
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
# Xbox 360 # Xbox 360
else ifeq ($(platform), xenon) else ifeq ($(platform), xenon)
@ -372,7 +362,6 @@ else ifeq ($(platform), arm64)
ARCH = aarch64 ARCH = aarch64
fpic := -fPIC fpic := -fPIC
SHARED := -shared SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
# AARCH64 generic # AARCH64 generic
@ -381,7 +370,6 @@ else ifeq ($(platform), aarch64)
ARCH = aarch64 ARCH = aarch64
fpic := -fPIC fpic := -fPIC
SHARED := -shared SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
# ARM # ARM
@ -423,7 +411,6 @@ else ifneq (,$(findstring armv,$(platform)))
else ifeq ($(platform), emscripten) else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc TARGET := $(TARGET_NAME)_libretro_$(platform).bc
ARCH = unknown ARCH = unknown
DONT_COMPILE_IN_ZLIB = 1
# GCW0 # GCW0
else ifeq ($(platform), gcw0) else ifeq ($(platform), gcw0)
@ -433,7 +420,6 @@ else ifeq ($(platform), gcw0)
SHARED := -shared -nostdlib SHARED := -shared -nostdlib
fpic := -fPIC fpic := -fPIC
LIBM := LIBM :=
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
# Windows MSVC 2017 all architectures # Windows MSVC 2017 all architectures