Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix emsdk 3.1.60 compile errors

This commit is contained in:
halx99 2024-05-24 03:53:03 +08:00
parent 76ce90c0b8
commit 3abf136a62
10 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
1k/1kiss.ps1
View File

@ -943,7 +943,7 @@ function setup_nasm() {
if (!$1k.isdir($nasm_bin)) {
fetch_pkg "https://www.nasm.us/pub/nasm/releasebuilds/$nasm_ver/win64/nasm-$nasm_ver-win64.zip"
}
$1k.addpath($nsis_bin)
$1k.addpath($nasm_bin)
}
elseif ($IsLinux) {
if ($(which dpkg)) {

4
3rdparty/CMakeLists.txt vendored
View File

@ -239,8 +239,9 @@ if(ANDROID)
add_subdirectory(android-specific/cpufeatures)
endif()
if(NOT EMSCRIPTEN)
ax_add_3rd(zlib)
if(NOT EMSCRIPTEN)
option(AX_WITH_WEBSOCKET_PARSER "Build with websocket parser" ON)
if (AX_WITH_WEBSOCKET_PARSER)
ax_add_3rd(websocket-parser)
@ -278,6 +279,7 @@ ax_add_3rd(freetype OPTIONS
"FT_DISABLE_BROTLI TRUE"
"FT_DISABLE_BZIP2 TRUE"
)
target_include_directories(freetype PRIVATE "${PNG_INCLUDE_DIR}")
if (WINRT)
target_compile_definitions(freetype PUBLIC "generic=GenericFromFreeTypeLibrary")
endif()

6
3rdparty/README.md vendored
View File

@ -47,7 +47,7 @@
## curl
- [![Upstream](https://img.shields.io/github/v/release/curl/curl?label=Upstream)](https://github.com/curl/curl)
- Version: 8.7.1
- Version: 8.8.0
- License: Curl (MIT/X)
## FastLZ
@ -92,7 +92,7 @@
## jpeg-turbo
- [![Upstream](https://img.shields.io/github/v/release/libjpeg-turbo/libjpeg-turbo?label=Upstream)](https://github.com/libjpeg-turbo/libjpeg-turbo)
- Version: 3.0.2
- Version: 3.0.3
- License: BSD-style (IJG,BSD-3-Clause,zlib)
## kcp
@ -118,7 +118,7 @@
- luajit
- Upstream: https://github.com/LuaJIT/LuaJIT
- Version: 2.1-d06beb0
- Version: 2.1-5790d25
- License: MIT
- tolua

5
3rdparty/png/CMakeLists.txt vendored
View File

@ -52,7 +52,8 @@ add_library(${target_name} STATIC
${libpng_intel_sources}
)
target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_LIST_DIR}")
set(PNG_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "png include dir" FORCE)
target_include_directories(${target_name} PUBLIC "${PNG_INCLUDE_DIR}")
if(_PNG_ISA_SIMD)
target_compile_definitions(${target_name} PUBLIC ${libpng_optimize_flag})
@ -66,5 +67,5 @@ endif()
# Export png as PNG::PNG to avoid cmake builtin FindPNG.cmake add target again
add_library(PNG::PNG ALIAS ${target_name})
set(PNG_PNG_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "png include dir" FORCE)
set(PNG_LIBRARY "png" CACHE INTERNAL "png include dir" FORCE)

6
3rdparty/simdjson/simdjson.h vendored
View File

@ -6279,15 +6279,15 @@ public:
simdjson_inline void one_char(char c);
simdjson_inline void call_print_newline() {
this->print_newline();
static_cast<formatter*>(this)->print_newline();
}
simdjson_inline void call_print_indents(size_t depth) {
this->print_indents(depth);
static_cast<formatter*>(this)->print_indents(depth);
}
simdjson_inline void call_print_space() {
this->print_space();
static_cast<formatter*>(this)->print_space();
}
protected:

2
3rdparty/unzip/CMakeLists.txt vendored
View File

@ -16,7 +16,5 @@ add_library(${target_name} STATIC
target_include_directories(${target_name} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
target_compile_definitions(${target_name} PUBLIC NOUNCRYPT=1)
if(MACOSX OR ANDROID OR WINDOWS OR LINUX)
get_target_property(zlib_header zlib INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(${target_name} PRIVATE ${zlib_header})
endif()

2
3rdparty/yasio/yasio/obstream.hpp vendored
View File

@ -149,7 +149,7 @@ public:
using implementation_type = _Cont;
using size_type = typename _Cont::size_type;
implementation_type& get_implementation() { return *this->outs_; }
const implementation_type& get_implementation() const { return *this->impl_; }
const implementation_type& get_implementation() const { return *this->outs_; }
dynamic_buffer_span(_Cont* outs) : outs_(outs) {}

2
README_CN.md
View File

@ -23,7 +23,7 @@
![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/axmolengine/axmol?style=plastic)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/axmolengine/axmol/pulls)
[![Discord](https://img.shields.io/discord/1099599084895088670?label=discord)](https://discord.gg/QjaQBhFVay)
[![QQ Group](https://pub.idqqimg.com/wpa/images/group.png)](https://jq.qq.com/?_wv=1027&k=nvNmzOIY)
[![awesome-cpp](https://badgen.net/badge/icon/awesome-cpp/pink?icon=awesome&label&color)](https://github.com/fffaraz/awesome-cpp)
[![ossinsight](https://badgen.net/badge/icon/ossinsight/pink?icon=awesome&label&color)](https://ossinsight.io/collections/game-engine/)

2
cmake/Modules/AXConfigDefine.cmake
View File

@ -199,7 +199,7 @@ if(EMSCRIPTEN)
# Tell emcc build port libs in cache with compiler flag `-pthread` xxx.c.o
# must via CMAKE_C_FLAGS and CMAKE_CXX_FLAGS?
set(_AX_EMCC_FLAGS "-sUSE_LIBJPEG=1 -sUSE_ZLIB=1")
set(_AX_EMCC_FLAGS "-sUSE_LIBJPEG=1")
set(CMAKE_C_FLAGS "${_AX_EMCC_FLAGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${_AX_EMCC_FLAGS} ${CMAKE_CXX_FLAGS}")

2
manifest.json
View File

@ -1,6 +1,6 @@
{
"versions": {
"1kdist": "v83",
"1kdist": "v85",
"oboe": "1.8.1",
"kcp": "v1.7-f2aa30e",
"lz4": "v1.9.4",