GP-4285: Building zlib source into sleigh binary on all platforms

This commit is contained in:
Ryan Kurtz 2024-03-26 07:10:43 -04:00
parent 1a7a1611ed
commit 01d9a33760

View File

@ -192,22 +192,18 @@ model {
} }
} // end cpp } // end cpp
if (isCurrentWindows()) { c {
c { source {
source { srcDir "src/decompile/zlib"
srcDir "src/decompile/zlib" include "*.c"
include "*.c"
}
} }
} }
} // end sources (sleigh) } // end sources (sleigh)
binaries { binaries {
all{ b -> all{ b ->
if (b.toolChain in Gcc || b.toolChain in Clang) {
b.linker.args "-lz"
}
b.cppCompiler.define "LOCAL_ZLIB" b.cppCompiler.define "LOCAL_ZLIB"
b.cCompiler.define "NO_GZIP"
} }
} // end binaries.all (sleigh) } // end binaries.all (sleigh)
} // end sleigh } // end sleigh
@ -252,7 +248,6 @@ model {
b.cCompiler.define "_CRT_NONSTDC_NO_DEPRECATE" b.cCompiler.define "_CRT_NONSTDC_NO_DEPRECATE"
b.cCompiler.define "WIN64" b.cCompiler.define "WIN64"
b.cCompiler.define "ZLIB_WINAPI" b.cCompiler.define "ZLIB_WINAPI"
b.cCompiler.define "NO_GZIP"
} }
else if (b.toolChain in Clang) { else if (b.toolChain in Clang) {
b.cppCompiler.args "-std=c++11" b.cppCompiler.args "-std=c++11"