Skip to content

Commit 4991653

Browse files
authored
v1.2.0
1 parent d1b86d9 commit 4991653

File tree

9 files changed

+26
-33
lines changed

9 files changed

+26
-33
lines changed

CHANGELOG.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ All notable changes to [ChaiLove](https://github.com/RobLoach/ChaiLove) will be
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## x.x.x - xxxx-xx-xx
8-
### Chores
7+
## 1.2.0 - 2022-02-20
8+
### Fixes
99
- Make PhysFS only support `.zip` compression
10+
11+
### Chores
1012
- Update vendor dependencies
13+
- Enable compilation of dingus, ios-arm64 and tvos-arm64 (by phcoder)
14+
- Remove submodule manipulation from `Makefile`
15+
- Switched Travis testing for [GitHub Actions](https://github.com/libretro/libretro-chailove/actions)
1116

1217
## 1.1.0 - 2019-12-31
1318
### Fixes

Makefile

+9-21
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,32 @@ CFLAGS += $(FLAGS) -std=gnu99
1515
all: $(TARGET)
1616
$(MAKE) $(TARGET)
1717

18-
$(TARGET): $(OBJECTS) | vendor/libretro-common/include/libretro.h
18+
$(TARGET): $(OBJECTS)
1919
ifeq ($(STATIC_LINKING), 1)
2020
$(AR) rcs $@ $(OBJECTS)
2121
else
2222
$(CXX) -o $@ $^ $(LDFLAGS)
2323
endif
2424

25-
%.o: %.cpp | vendor/libretro-common/include/libretro.h
25+
%.o: %.cpp
2626
$(CXX) -c -o $@ $< $(CXXFLAGS)
2727

28-
%.o: %.c | vendor/libretro-common/include/libretro.h
28+
%.o: %.c
2929
$(CC) -c -o $@ $< $(CFLAGS)
3030

31-
%.o: %.m | vendor/libretro-common/include/libretro.h
31+
%.o: %.m
3232
$(CC) -c -o $@ $< $(CFLAGS)
3333

34-
%.o: %.S | vendor/libretro-common/include/libretro.h
34+
%.o: %.S
3535
$(CC) -c -o $@ $< $(CFLAGS)
3636

3737
clean:
3838
rm -f $(TARGET) $(OBJECTS)
39-
git clean -xdf
40-
rm -rf vendor
41-
git reset --hard HEAD
42-
git submodule update -f --init --recursive
43-
git submodule foreach --recursive git clean -xfd
44-
git submodule foreach --recursive git reset --hard HEAD
45-
46-
vendor/libretro-common/include/libretro.h:
47-
@git submodule update --init --recursive
48-
49-
submodules-update:
50-
@git submodule update --remote
5139

5240
test: unittest unittest-chailove cpplint
5341
@echo "Run the testing suite by using:\n\n retroarch -L $(TARGET) test/main.chai\n\n"
5442

55-
vendor/noarch/noarch: vendor/libretro-common/include/libretro.h
43+
vendor/noarch/noarch:
5644
cd vendor/noarch && cmake .
5745
@$(MAKE) -C vendor/noarch
5846

@@ -68,7 +56,7 @@ examples: all
6856
test-script: all
6957
@retroarch -L $(TARGET) test/main.chai
7058

71-
docs: vendor/libretro-common/include/libretro.h docs/html
59+
docs: docs/html
7260

7361
docs/html: docs-clean
7462
doxygen docs/Doxyfile
@@ -84,7 +72,7 @@ docs-deploy: docs
8472
npm install push-dir
8573
node_modules/.bin/push-dir --dir=docs/html --branch=docs
8674

87-
cpplint: vendor/libretro-common/include/libretro.h
75+
cpplint:
8876
@vendor/styleguide/cpplint/cpplint.py \
8977
--linelength=120 \
9078
--quiet \
@@ -94,7 +82,7 @@ cpplint: vendor/libretro-common/include/libretro.h
9482
-readability/casting,-whitespace/line_length,-runtime/references \
9583
src/ChaiLove.cpp src/ChaiLove.h src/libretro.cpp src/love/*.h src/love/*.cpp src/love/Types/*/*.h src/love/Types/*/*.cpp
9684

97-
tests: vendor/libretro-common/include/libretro.h
85+
tests:
9886
$(MAKE) HAVE_CHAISCRIPT=0 HAVE_TESTS=1
9987

10088
PREFIX := /usr

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ChaiLove :heart:
2-
[![Travis](https://travis-ci.org/libretro/libretro-chailove.svg?branch=master)](https://travis-ci.org/libretro/libretro-chailove)
3-
[![Appveyor](https://ci.appveyor.com/api/projects/status/es2wh45kcu76n6a9/branch/master?svg=true)](https://ci.appveyor.com/project/RobLoach/libretro-chailove/branch/master)
2+
3+
[![Tests](https://github.com/libretro/libretro-chailove/actions/workflows/build.yml/badge.svg)](https://github.com/libretro/libretro-chailove/actions/workflows/build.yml)
44
[![platform libretro](https://img.shields.io/badge/platform-libretro-brightgreen.svg)](http://buildbot.fiveforty.net/admin/buildbot/build/?name=chailove)
55
[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](https://rawgit.com/libretro/libretro-chailove/docs/)
66

@@ -18,7 +18,7 @@ ChaiLove is an awesome framework you can use to make 2D games in [ChaiScript](ht
1818

1919
## Installation
2020

21-
ChaiLove is a [libretro](https://www.libretro.com/) core, which can be installed through [RetroArch](http://retroarch.com/).
21+
ChaiLove is a [libretro](https://www.libretro.com/) core, which can be installed through [RetroArch](http://retroarch.com/).
2222

2323
1. Run [RetroArch](http://retroarch.com/)
2424
2. *Online Updater**Core Updator**ChaiLove*

src/ChaiLove.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
#define SRC_CHAILOVE_H_
4646

4747
#define CHAILOVE_VERSION_MAJOR 1
48-
#define CHAILOVE_VERSION_MINOR 1
48+
#define CHAILOVE_VERSION_MINOR 2
4949
#define CHAILOVE_VERSION_PATCH 0
50-
#define CHAILOVE_VERSION_STRING "1.1.0"
50+
#define CHAILOVE_VERSION_STRING "1.2.0"
5151

5252
#include "SDL.h"
5353
#include "libretro.h"

vendor/Snippets

vendor/cppcodec

Submodule cppcodec updated 1 file

vendor/random

0 commit comments

Comments
 (0)