Merge branch 'main' into dev
This commit is contained in:
halx99 2023-07-18 15:17:31 +08:00
parent a858d08cc3
commit caacef1215
2 changed files with 2 additions and 3 deletions

View File

@ -9,7 +9,6 @@
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/81fa1aba09ab41a98b949064b928d06e)](https://www.codacy.com/gh/axmolengine/axmol/dashboard?utm_source=github.com&utm_medium=referral&utm_content=axmolengine/axmol&utm_campaign=Badge_Grade)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/axmolengine/axmol/pulls)
[![vscode.dev](https://img.shields.io/badge/vscode.dev-green.svg)](https://vscode.dev/github/axmolengine/axmol)
[![Gitter](https://img.shields.io/gitter/room/axmolengine/axmol)](https://gitter.im/axmolengine/axmol)
[![Discord](https://img.shields.io/discord/1099599084895088670?label=discord)](https://discord.com/channels/1099599084895088670)
![issues](https://img.shields.io/github/issues/axmolengine/axmol?style=plastic)

View File

@ -4,11 +4,11 @@
// 0x00 HI ME LO
// 00 03 08 00
#define AX_VERSION_MAJOR 1
#define AX_VERSION_MINOR 1
#define AX_VERSION_MINOR 0
#define AX_VERSION_PATCH 0
/* Define the axmol version string, easy for script parsing */
#define AX_VERSION_STR "1.1.0"
#define AX_VERSION_STR "1.0.0"
/* Define axmol version helper macros */
#define AX_VERSION_MAKE(a,b,c) ((a << 16) | (b << 8) | (c & 0xff))