mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-10-06 06:00:12 +00:00
Merge branch 'xbzk/pavel-zbic-addendum' into zbic-support
This commit is contained in:
@@ -151,7 +151,7 @@ add_library(
|
|||||||
|
|
||||||
set_source_files_properties(zbic_compression.cpp PROPERTIES
|
set_source_files_properties(zbic_compression.cpp PROPERTIES
|
||||||
INCLUDE_DIRECTORIES "${ZBIC_INCLUDE_DIR}"
|
INCLUDE_DIRECTORIES "${ZBIC_INCLUDE_DIR}"
|
||||||
COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function>")
|
COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function;-Wno-missing-declarations;-Wno-shadow>")
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
target_sources(common PRIVATE windows/timer_resolution.cpp
|
target_sources(common PRIVATE windows/timer_resolution.cpp
|
||||||
|
|||||||
@@ -12,6 +12,10 @@
|
|||||||
#define ZSTDERRORLIB_HIDDEN static
|
#define ZSTDERRORLIB_HIDDEN static
|
||||||
#undef ZSTD_MULTITHREAD
|
#undef ZSTD_MULTITHREAD
|
||||||
|
|
||||||
|
#if defined(__ANDROID__)
|
||||||
|
#undef _GNU_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "zstd.h"
|
#include "zstd.h"
|
||||||
#include "zstd.c"
|
#include "zstd.c"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user