This commit is contained in:
Rob Loach 2022-02-20 19:03:01 -05:00 committed by GitHub
parent d1b86d934a
commit 4991653afe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 33 deletions

View File

@ -4,10 +4,15 @@ 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).
## x.x.x - xxxx-xx-xx
### Chores
## 1.2.0 - 2022-02-20
### Fixes
- Make PhysFS only support `.zip` compression
### Chores
- Update vendor dependencies
- Enable compilation of dingus, ios-arm64 and tvos-arm64 (by phcoder)
- Remove submodule manipulation from `Makefile`
- Switched Travis testing for [GitHub Actions](https://github.com/libretro/libretro-chailove/actions)
## 1.1.0 - 2019-12-31
### Fixes

View File

@ -15,44 +15,32 @@ CFLAGS += $(FLAGS) -std=gnu99
all: $(TARGET)
$(MAKE) $(TARGET)
$(TARGET): $(OBJECTS) | vendor/libretro-common/include/libretro.h
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJECTS)
else
$(CXX) -o $@ $^ $(LDFLAGS)
endif
%.o: %.cpp | vendor/libretro-common/include/libretro.h
%.o: %.cpp
$(CXX) -c -o $@ $< $(CXXFLAGS)
%.o: %.c | vendor/libretro-common/include/libretro.h
%.o: %.c
$(CC) -c -o $@ $< $(CFLAGS)
%.o: %.m | vendor/libretro-common/include/libretro.h
%.o: %.m
$(CC) -c -o $@ $< $(CFLAGS)
%.o: %.S | vendor/libretro-common/include/libretro.h
%.o: %.S
$(CC) -c -o $@ $< $(CFLAGS)
clean:
rm -f $(TARGET) $(OBJECTS)
git clean -xdf
rm -rf vendor
git reset --hard HEAD
git submodule update -f --init --recursive
git submodule foreach --recursive git clean -xfd
git submodule foreach --recursive git reset --hard HEAD
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"
vendor/noarch/noarch: vendor/libretro-common/include/libretro.h
vendor/noarch/noarch:
cd vendor/noarch && cmake .
@$(MAKE) -C vendor/noarch
@ -68,7 +56,7 @@ examples: all
test-script: all
@retroarch -L $(TARGET) test/main.chai
docs: vendor/libretro-common/include/libretro.h docs/html
docs: docs/html
docs/html: docs-clean
doxygen docs/Doxyfile
@ -84,7 +72,7 @@ docs-deploy: docs
npm install push-dir
node_modules/.bin/push-dir --dir=docs/html --branch=docs
cpplint: vendor/libretro-common/include/libretro.h
cpplint:
@vendor/styleguide/cpplint/cpplint.py \
--linelength=120 \
--quiet \
@ -94,7 +82,7 @@ cpplint: vendor/libretro-common/include/libretro.h
-readability/casting,-whitespace/line_length,-runtime/references \
src/ChaiLove.cpp src/ChaiLove.h src/libretro.cpp src/love/*.h src/love/*.cpp src/love/Types/*/*.h src/love/Types/*/*.cpp
tests: vendor/libretro-common/include/libretro.h
tests:
$(MAKE) HAVE_CHAISCRIPT=0 HAVE_TESTS=1
PREFIX := /usr

View File

@ -1,6 +1,6 @@
# ChaiLove :heart:
[![Travis](https://travis-ci.org/libretro/libretro-chailove.svg?branch=master)](https://travis-ci.org/libretro/libretro-chailove)
[![Appveyor](https://ci.appveyor.com/api/projects/status/es2wh45kcu76n6a9/branch/master?svg=true)](https://ci.appveyor.com/project/RobLoach/libretro-chailove/branch/master)
[![Tests](https://github.com/libretro/libretro-chailove/actions/workflows/build.yml/badge.svg)](https://github.com/libretro/libretro-chailove/actions/workflows/build.yml)
[![platform libretro](https://img.shields.io/badge/platform-libretro-brightgreen.svg)](http://buildbot.fiveforty.net/admin/buildbot/build/?name=chailove)
[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](https://rawgit.com/libretro/libretro-chailove/docs/)
@ -18,7 +18,7 @@ ChaiLove is an awesome framework you can use to make 2D games in [ChaiScript](ht
## Installation
ChaiLove is a [libretro](https://www.libretro.com/) core, which can be installed through [RetroArch](http://retroarch.com/).
ChaiLove is a [libretro](https://www.libretro.com/) core, which can be installed through [RetroArch](http://retroarch.com/).
1. Run [RetroArch](http://retroarch.com/)
2. *Online Updater**Core Updator* → *ChaiLove*

View File

@ -45,9 +45,9 @@
#define SRC_CHAILOVE_H_
#define CHAILOVE_VERSION_MAJOR 1
#define CHAILOVE_VERSION_MINOR 1
#define CHAILOVE_VERSION_MINOR 2
#define CHAILOVE_VERSION_PATCH 0
#define CHAILOVE_VERSION_STRING "1.1.0"
#define CHAILOVE_VERSION_STRING "1.2.0"
#include "SDL.h"
#include "libretro.h"

2
vendor/Snippets vendored

@ -1 +1 @@
Subproject commit d138a3ec89a61c468c26f7593590fe6793dca40c
Subproject commit 92696de8de6526857d991af5e8d756111c67bac4

2
vendor/cppcodec vendored

@ -1 +1 @@
Subproject commit bd6ddf95129e769b50ef63e0f558fa21364f3f65
Subproject commit 9838f9eaf077e42121cb42361e9a1613901fc5e8

@ -1 +1 @@
Subproject commit 996376e36d3f4f56eba202cb96230568628d2583
Subproject commit 716bb5e7b761a3b4d44e069c84491d906d32aba0

2
vendor/physfs vendored

@ -1 +1 @@
Subproject commit f8f89035c4ff326c5586285733aad2cd66c6e734
Subproject commit a0dfe220ffb97eef2c78fef2b8971995f221b18d

2
vendor/random vendored

@ -1 +1 @@
Subproject commit 528b3819ac0fb3fe151c1c5c9d125a317b76b81f
Subproject commit c697860d97d8f6bed70d4d51bf73211484f6ddfc