Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zlib: removes zlib sources and updates version used to 1.2.11 #280

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions TotalCrossVM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS AND NOT DEFINED TCVM_SHARED)
endif()
endif()

add_subdirectory(third_party)

# Find SDL2 and Skia
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")

Expand Down Expand Up @@ -91,18 +93,6 @@ set(SOURCES
${TC_SRCDIR}/minizip/unzip.c
${TC_SRCDIR}/minizip/zip.c

${TC_SRCDIR}/zlib/adler32.c
${TC_SRCDIR}/zlib/compress.c
${TC_SRCDIR}/zlib/crc32.c
${TC_SRCDIR}/zlib/deflate.c
${TC_SRCDIR}/zlib/infback.c
${TC_SRCDIR}/zlib/inffast.c
${TC_SRCDIR}/zlib/inflate.c
${TC_SRCDIR}/zlib/inftrees.c
${TC_SRCDIR}/zlib/trees.c
${TC_SRCDIR}/zlib/uncompr.c
${TC_SRCDIR}/zlib/zutil.c

${TC_SRCDIR}/ras/ras_Utils.c

${TC_SRCDIR}/nm/map/GoogleMaps.c
Expand Down Expand Up @@ -426,7 +416,6 @@ include_directories(${TC_SRCDIR}/sync)
include_directories(${TC_SRCDIR}/tcvm)
include_directories(${TC_SRCDIR}/util)
include_directories(${TC_SRCDIR}/util/android)
include_directories(${TC_SRCDIR}/zlib)

if(MSVC)
include_directories(${TC_SRCDIR}/nm/qrcode/win)
Expand Down Expand Up @@ -499,6 +488,14 @@ else()
add_library(tcvm STATIC ${LIBRARY_ARGS})
endif()

# ZLIB
target_include_directories(tcvm PRIVATE
"${ZLIB_INCLUDE_DIR}"
)
if(ZLIB_SHOULD_LINK)
target_link_libraries(tcvm zlibstatic)
endif()

# Set C/CXX flags
target_compile_options(tcvm
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion TotalCrossVM/src/nm/util/zip/CompressedStream.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


#include "tcvm.h"
#include "../../../zlib/zutil.h"
#include "zutil.h"

#define BUFSIZE 0x400

Expand Down
4 changes: 2 additions & 2 deletions TotalCrossVM/src/nm/util/zip_ZLib.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include "tcvm.h"

#include "../../zlib/zlib.h"
#include "../../zlib/zutil.h"
#include "zlib.h"
#include "zutil.h"

#define BUFSIZE 0x400

Expand Down
2 changes: 1 addition & 1 deletion TotalCrossVM/src/util/tcz.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef TCZLIB_H
#define TCZLIB_H

#include "../zlib/zlib.h"
#include "zlib.h"

#define TCZ_VERSION 200
#define ATTR_HAS_MAINCLASS 1 // if false, it is a library-only module
Expand Down
179 changes: 0 additions & 179 deletions TotalCrossVM/src/zlib/adler32.c

This file was deleted.

80 changes: 0 additions & 80 deletions TotalCrossVM/src/zlib/compress.c

This file was deleted.

Loading