mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-15 08:32:07 +00:00
GP-4285: Building zlib source into sleigh binary on all platforms
This commit is contained in:
parent
1a7a1611ed
commit
01d9a33760
@ -192,22 +192,18 @@ model {
|
||||
}
|
||||
} // end cpp
|
||||
|
||||
if (isCurrentWindows()) {
|
||||
c {
|
||||
source {
|
||||
srcDir "src/decompile/zlib"
|
||||
include "*.c"
|
||||
}
|
||||
c {
|
||||
source {
|
||||
srcDir "src/decompile/zlib"
|
||||
include "*.c"
|
||||
}
|
||||
}
|
||||
} // end sources (sleigh)
|
||||
|
||||
binaries {
|
||||
all{ b ->
|
||||
if (b.toolChain in Gcc || b.toolChain in Clang) {
|
||||
b.linker.args "-lz"
|
||||
}
|
||||
b.cppCompiler.define "LOCAL_ZLIB"
|
||||
b.cCompiler.define "NO_GZIP"
|
||||
}
|
||||
} // end binaries.all (sleigh)
|
||||
} // end sleigh
|
||||
@ -252,7 +248,6 @@ model {
|
||||
b.cCompiler.define "_CRT_NONSTDC_NO_DEPRECATE"
|
||||
b.cCompiler.define "WIN64"
|
||||
b.cCompiler.define "ZLIB_WINAPI"
|
||||
b.cCompiler.define "NO_GZIP"
|
||||
}
|
||||
else if (b.toolChain in Clang) {
|
||||
b.cppCompiler.args "-std=c++11"
|
||||
|
Loading…
Reference in New Issue
Block a user