Fix PrebuildLibrary

This commit is contained in:
zosrothko
2018-03-31 11:05:43 +02:00
parent a42c019ca5
commit 2ca964c699

View File

@@ -25,8 +25,6 @@ model {
headers.srcDir "$mysql64Home/include" headers.srcDir "$mysql64Home/include"
staticLibraryFile = file("$mysql64Home/lib/$libName") staticLibraryFile = file("$mysql64Home/lib/$libName")
} }
} else {
throw new GradleException("Unknown buildType" + buildType)
} }
} }
binaries.withType(SharedLibraryBinary) { binaries.withType(SharedLibraryBinary) {
@@ -59,8 +57,6 @@ model {
sharedLibraryFile = file("$mysql64Home/lib/$dllName") sharedLibraryFile = file("$mysql64Home/lib/$dllName")
sharedLibraryLinkFile = file("$mysql64Home/lib/$linkName") sharedLibraryLinkFile = file("$mysql64Home/lib/$linkName")
} }
} else {
throw new GradleException("Unknown buildType" + buildType)
} }
} }
} }
@@ -88,7 +84,9 @@ model {
all { all {
cppCompiler.define "THREADSAFE" cppCompiler.define "THREADSAFE"
cppCompiler.define "__LCC__" cppCompiler.define "__LCC__"
cppCompiler.define "WINVER=0x0600" if (toolChain in VisualCpp) {
cppCompiler.define "WINVER=0x0600"
}
} }
withType(SharedLibraryBinarySpec) { withType(SharedLibraryBinarySpec) {
if (toolChain in VisualCpp) { if (toolChain in VisualCpp) {