mirror of
https://github.com/celisej567/mcpe.git
synced 2026-01-05 18:10:09 +03:00
Add zlib to the web build, fix an error in CThread...
This commit is contained in:
@@ -37,19 +37,19 @@ pause > nul
|
||||
|
||||
:build
|
||||
echo * Starting build.
|
||||
start cmake --build .
|
||||
cmake --build .
|
||||
echo * PRESS ANY KEY when CMake is done.
|
||||
pause > nul
|
||||
|
||||
:bundle
|
||||
echo * Copying bundle data over.
|
||||
copy reminecraftpe.* ..\dist
|
||||
copy reminecraftpe.* ..\dist\
|
||||
copy ..\..\platforms\sdl\wasm_shell.html ..\dist\reminecraftpe.html
|
||||
copy ..\..\thirdparty\coi-serviceworker\coi-serviceworker.min.js ..\dist
|
||||
|
||||
:for me only
|
||||
echo * Copying to your webserver.
|
||||
copy ..\dist %WEBSRVROOT%\dist
|
||||
copy ..\dist\* %WEBSRVROOT%\dist
|
||||
|
||||
:cd back
|
||||
echo * And we are done!!
|
||||
|
||||
@@ -208,12 +208,16 @@ add_library(reminecraftpe-core STATIC
|
||||
App.cpp
|
||||
AppPlatform.cpp
|
||||
)
|
||||
target_include_directories(reminecraftpe-core PUBLIC . ..)
|
||||
target_include_directories(reminecraftpe-core PUBLIC . .. ../thirdparty/zlib)
|
||||
|
||||
# RakNet
|
||||
add_subdirectory(../thirdparty/raknet raknet)
|
||||
target_link_libraries(reminecraftpe-core PUBLIC raknet)
|
||||
|
||||
# zlib
|
||||
add_subdirectory(../thirdparty/zlib zlib)
|
||||
target_link_libraries(reminecraftpe-core PUBLIC zlib)
|
||||
|
||||
# SDL
|
||||
add_library(SDL INTERFACE)
|
||||
if(EMSCRIPTEN)
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
SPDX-License-Identifier: BSD-1-Clause
|
||||
********************************************************************/
|
||||
|
||||
#include <cstdint>
|
||||
#include "CThread.hpp"
|
||||
#include "client/common/Utils.hpp"
|
||||
|
||||
|
||||
22
thirdparty/zlib/CMakeLists.txt
vendored
Normal file
22
thirdparty/zlib/CMakeLists.txt
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
cmake_minimum_required(VERSION 3.16.0)
|
||||
project(zlib)
|
||||
|
||||
# Build
|
||||
add_library(zlib STATIC
|
||||
adler32.c
|
||||
compress.c
|
||||
crc32.c
|
||||
deflate.c
|
||||
gzclose.c
|
||||
gzlib.c
|
||||
gzread.c
|
||||
gzwrite.c
|
||||
infback.c
|
||||
inffast.c
|
||||
inflate.c
|
||||
inftrees.c
|
||||
trees.c
|
||||
uncompr.c
|
||||
zutil.c
|
||||
)
|
||||
target_include_directories(zlib PUBLIC .)
|
||||
2
thirdparty/zlib/gzguts.h
vendored
2
thirdparty/zlib/gzguts.h
vendored
@@ -37,6 +37,8 @@
|
||||
|
||||
#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
|
||||
# include <io.h>
|
||||
#else
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
Reference in New Issue
Block a user