Update gradle

This commit is contained in:
zosrothko
2018-04-20 13:25:51 +02:00
parent dc0897e26f
commit ca03c6b471
5 changed files with 103 additions and 90 deletions

View File

@@ -7,22 +7,22 @@ model {
if (buildType == buildTypes.debug) {
libName = 'libmysqld.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir "$mysql32Home/include"
headers.srcDir new File("$mysql32Home/include")
staticLibraryFile = new File("$mysql32Home/lib/$libName")
} else
if (targetPlatform.name == 'win64') {
headers.srcDir "$mysql64Home/include"
headers.srcDir new File("$mysql64Home/include")
staticLibraryFile = new File("$mysql64Home/lib/$libName")
}
} else
if (buildType == buildTypes.release) {
libName = 'libmysql.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir "$mysql32Home/include"
headers.srcDir new File("$mysql32Home/include")
staticLibraryFile = new File("$mysql32Home/lib/$libName")
} else
if (targetPlatform.name == 'win64') {
headers.srcDir "$mysql64Home/include"
headers.srcDir new File("$mysql64Home/include")
staticLibraryFile = new File("$mysql64Home/lib/$libName")
}
}
@@ -34,12 +34,12 @@ model {
dllName = 'libmysqld.dll'
linkName = 'libmysqld.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir "$mysql32Home/include"
headers.srcDir new File("$mysql32Home/include")
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
} else
if (targetPlatform.name == 'win64') {
headers.srcDir "$mysql64Home/include"
headers.srcDir new File("$mysql64Home/include")
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
}
@@ -48,12 +48,12 @@ model {
dllName = 'libmysql.dll'
linkName = 'libmysql.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir "$mysql32Home/include"
headers.srcDir new File("$mysql32Home/include")
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
} else
if (targetPlatform.name == 'win64') {
headers.srcDir "$mysql64Home/include"
headers.srcDir new File("$mysql64Home/include")
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
}
@@ -73,7 +73,7 @@ model {
exportedHeaders {
srcDir 'include'
}
lib library: 'mysql'
// lib library: 'mysql'
lib project: ':Data', library: 'Data'
lib project: ':Foundation', library: 'Foundation'
}
@@ -83,10 +83,26 @@ model {
binaries {
all {
cppCompiler.define "THREADSAFE"
cppCompiler.define "__LCC__"
if (toolChain in VisualCpp) {
cppCompiler.define "WINVER=0x0600"
cppCompiler.define "__LCC__"
}
/*
SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
SYSFLAGS += -DTHREADSAFE -DNO_TCL
*/
if (toolChain in Gcc) {
def String LIB64SUFFIX = "64"
cppCompiler.define "NO_TCL"
cppCompiler.args ( "-I", "/usr/local/include/mysql/" )
cppCompiler.args ( "-I", "/usr/include/mysql/" )
cppCompiler.args ( "-I", "/usr/mysql/include/mysql" )
cppCompiler.args ( "-I", "/usr/local/mysql/include" )
linker.args "-L/usr/local/lib$LIB64SUFFIX/mysql -L/usr/lib$LIB64SUFFIX/mysql -L/usr/mysql/lib$LIB64SUFFIX -L/usr/mysql/lib$LIB64SUFFIX/mysql -L/usr/local/mysql/lib$LIB64SUFFIX -lmysqlclient"
}
}
withType(SharedLibraryBinarySpec) {
if (toolChain in VisualCpp) {