Unverified Commit 817c391c authored by RobLoach's avatar RobLoach Committed by GitHub
Browse files

Update dependencies (#265)

* Update libretro-common
* Ignore dirty
* Add branch to .gitmodules
* Update submodules
* Update ChaiScript
* Remove physfs
* Update PhysFS
* Ignore dirty for physfs
* Update CHANGELOG.md
* PhysFS Apple updates
* Add .m file manually
* Fix .o file name
* PhysFS workaround
* Revert PhysFS update
* Use Foundation
* Don't copy .m file
* Add SOURCES_M only on Linux
parent bf722bfd
......@@ -2,47 +2,74 @@
path = vendor/sdl-libretro
url = https://github.com/libretro/sdl-libretro.git
ignore = dirty
branch = master
[submodule "vendor/libretro-common"]
path = vendor/libretro-common
url = https://github.com/libretro/libretro-common.git
ignore = dirty
branch = master
[submodule "vendor/chaiscript"]
path = vendor/chaiscript
url = https://github.com/ChaiScript/ChaiScript.git
[submodule "vendor/physfs"]
path = vendor/physfs
url = https://github.com/RobLoach/physfs.git
ignore = dirty
branch = develop
[submodule "vendor/filesystem"]
path = vendor/filesystem
url = https://github.com/wjakob/filesystem.git
ignore = dirty
branch = master
[submodule "vendor/SDL_tty"]
path = vendor/SDL_tty
url = https://github.com/Grumbel/SDL_tty.git
ignore = dirty
branch = master
[submodule "vendor/stb"]
path = vendor/stb
url = https://github.com/nothings/stb.git
ignore = dirty
branch = master
[submodule "vendor/Snippets"]
path = vendor/Snippets
url = https://github.com/DanielGibson/Snippets.git
ignore = dirty
branch = master
[submodule "vendor/libretro-deps"]
path = vendor/libretro-deps
url = https://github.com/libretro/libretro-deps.git
ignore = dirty
branch = master
[submodule "vendor/styleguide"]
path = vendor/styleguide
url = https://github.com/google/styleguide.git
ignore = dirty
branch = gh-pages
[submodule "vendor/noarch"]
path = vendor/noarch
url = https://github.com/RobLoach/noarch.git
ignore = dirty
branch = master
[submodule "vendor/ChaiScript_Extras"]
path = vendor/ChaiScript_Extras
url = https://github.com/ChaiScript/ChaiScript_Extras.git
ignore = dirty
branch = master
[submodule "vendor/random"]
path = vendor/random
url = https://github.com/effolkronium/random.git
ignore = dirty
branch = master
[submodule "vendor/semver"]
path = vendor/semver
url = https://github.com/h2non/semver.c.git
ignore = dirty
branch = master
[submodule "vendor/TinySHA1"]
path = vendor/TinySHA1
url = https://github.com/mohaps/TinySHA1.git
ignore = dirty
branch = master
[submodule "vendor/physfs"]
path = vendor/physfs
url = https://github.com/Didstopia/physfs.git
branch = master
ignore = dirty
......@@ -4,6 +4,20 @@ All notable changes to [ChaiLove](https://github.com/RobLoach/ChaiLove) will be
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## 0.23.0 - Unreleased
### Chores
- Updated dependencies
- [ChaiScript 6.1.0](https://github.com/ChaiScript/ChaiScript/releases/tag/v6.1.0)
- PhysFS
- libretro-common
- libretro-deps
- noarch
- styleguide
### Fixes
- Fix uninitalized image pointer causing segfault
- By [@orbea](https://github.com/orbea) in [#263](https://github.com/libretro/libretro-chailove/pull/263)
## 0.22.2 - 2018-05-06
### Fixes
- Documentation
......
......@@ -24,6 +24,9 @@ $(TARGET): $(OBJECTS) | vendor/libretro-common/include/libretro.h
%.o: %.c | vendor/libretro-common/include/libretro.h
-$(CC) -c -o $@ $< $(CFLAGS)
%.o: %.m | vendor/libretro-common/include/libretro.h
-$(CC) -c -o $@ $< $(CFLAGS)
clean:
rm -f $(TARGET) $(OBJECTS)
git clean -xdf
......@@ -35,6 +38,9 @@ clean:
vendor/libretro-common/include/libretro.h:
@git submodule update --init --recursive
submodules-update:
@git submodule update --remote
test: unittest unittest-chailove cpplint
@echo "Run the testing suite by using:\n\n retroarch -L $(TARGET) test/main.chai\n\n"
......
......@@ -52,9 +52,10 @@ SOURCES_C += $(wildcard \
)
ifeq ($(platform), osx)
# LDFLAGS += -mmacosx-version-min=10.2
LDFLAGS += -framework Carbon -framework IOKit
LDFLAGS += -framework IOKit -framework Foundation
# FLAGS += -DMAC_OS_X_VERSION_MIN_REQUIRED=1020
FLAGS += -D__MACH__ -D__APPLE__
FLAGS += -D__MACH__ -D__APPLE__ -DPHYSFS_PLATFORM_APPLE
SOURCES_M += $(CORE_DIR)/vendor/physfs/src/physfs_platform_apple.m
endif
# SDL_tty
......@@ -163,7 +164,7 @@ endif
FLAGS += -DSDL_THREADS_DISABLED -DSDL_CDROM_DISABLED
FLAGS += -I$(CORE_DIR)/vendor/sdl-libretro/include
OBJECTS += $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
OBJECTS += $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o) $(SOURCES_M:.m=.o)
LDFLAGS += $(fpic) $(SHARED) $(EXTRA_LDF)
......
Subproject commit 9a670d79fc6be0446bbe5d7573ad26faf0786144
Subproject commit ac0d7ce94925f8eac367533b276d9d7db13a77ae
Subproject commit 0ee02b2cdc16a4e198549436084189fb1e34a7af
Subproject commit cda6a73154bd81fe7c662893e65343c9b874e4cc
Subproject commit fbc66c7be877ea43c3e0600a336e3f48067d5c00
Subproject commit 1cb035b1fde0b87ce31cfb0f89e8af5491a41065
Subproject commit 6e3ad249a62aa7828543d2f62b2e3539f0c81e3a
Subproject commit 6e86ac50ac2669fe5470f298736605d44e4148c4
Subproject commit 9d5b3dfde8e57c4a9cd2ff6249aad8e2fa62aa0d
Subproject commit 0196f2eb58ca8310640ff8b2c302d25b38eefd80
Subproject commit 1b206ee36263b16ec18f7b2f86a2b770b7490844
Subproject commit d3881b4fa910526f0e60e56d0110a9c6492949d8
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