Unverified Commit e300ec2c authored by Rob Loach's avatar Rob Loach Committed by GitHub
Browse files

Merge pull request #397 from libretro/physfs

Update to physfs 3.0.2
parents 51caa9a8 b67d2d1e
......@@ -58,13 +58,13 @@
url = https://github.com/mohaps/TinySHA1.git
ignore = dirty
branch = master
[submodule "vendor/didstopia-physfs"]
path = vendor/didstopia-physfs
url = https://github.com/Didstopia/physfs.git
ignore = dirty
branch = master
[submodule "vendor/cppcodec"]
path = vendor/cppcodec
url = https://github.com/tplgy/cppcodec.git
ignore = dirty
branch = master
[submodule "vendor/physfs"]
path = vendor/physfs
url = https://github.com/icculus/physfs.git
ignore = dirty
branch = main
......@@ -82,19 +82,19 @@ FLAGS += -I$(CORE_DIR)/vendor/libretro-common/compat
FLAGS += -DWANT_ZLIB
# PhysFS
FLAGS += -I$(CORE_DIR)/vendor/didstopia-physfs/src
FLAGS += -I$(CORE_DIR)/vendor/didstopia-physfs/extras
FLAGS += -I$(CORE_DIR)/vendor/physfs/src
FLAGS += -I$(CORE_DIR)/vendor/physfs/extras
FLAGS += -DPHYSFS_NO_CDROM_SUPPORT=1
SOURCES_C += $(wildcard \
$(CORE_DIR)/vendor/didstopia-physfs/extras/physfsrwops.c \
$(CORE_DIR)/vendor/didstopia-physfs/src/*.c \
$(CORE_DIR)/vendor/physfs/extras/physfsrwops.c \
$(CORE_DIR)/vendor/physfs/src/*.c \
)
ifeq ($(platform), osx)
# LDFLAGS += -mmacosx-version-min=10.2
LDFLAGS += -framework IOKit -framework Foundation
# FLAGS += -DMAC_OS_X_VERSION_MIN_REQUIRED=1020
FLAGS += -D__MACH__ -D__APPLE__ -DPHYSFS_PLATFORM_APPLE
SOURCES_M += $(CORE_DIR)/vendor/didstopia-physfs/src/physfs_platform_apple.m
SOURCES_M += $(CORE_DIR)/vendor/physfs/src/physfs_platform_apple.m
endif
# SDL_tty
......
......@@ -604,7 +604,7 @@ ifeq ($(platform), ios-arm64)
LDFLAGS += -framework IOKit -framework Foundation
FLAGS += -D__MACH__ -D__APPLE__ -DPHYSFS_PLATFORM_APPLE
FLAGS += -DCHAILOVE_DISABLE_LOVE_SYSTEM_EXECUTE
SOURCES_M += $(CORE_DIR)/vendor/didstopia-physfs/src/physfs_platform_apple.m
SOURCES_M += $(CORE_DIR)/vendor/physfs/src/physfs_platform_apple.m
endif
ifeq ($(EXTERNAL_ZLIB), 1)
......
Subproject commit a25c37f5f1552e30094234bac46a21e3e57cf9f7
Subproject commit f8f89035c4ff326c5586285733aad2cd66c6e734
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment