< prev index next >

buildSrc/linux.gradle

Print this page
rev 9734 : 8087516: Conditional support for GTK 3 on Linux
Reviewed-by:

*** 70,80 **** } propFile << "cflags=" << results.toString().trim() << "\n"; results = new ByteArrayOutputStream(); exec { ! commandLine "pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst" standardOutput = results } propFile << "libs=" << results.toString().trim(); }, { properties -> --- 70,80 ---- } propFile << "cflags=" << results.toString().trim() << "\n"; results = new ByteArrayOutputStream(); exec { ! commandLine "pkg-config", "--libs", "pangocairo", "gio-2.0", "gthread-2.0", "xtst" standardOutput = results } propFile << "libs=" << results.toString().trim(); }, { properties ->
*** 142,152 **** "com/sun/glass/ui/gtk/*"] LINUX.glass.nativeSource = file("modules/graphics/src/main/native-glass/gtk") LINUX.glass.compiler = compiler LINUX.glass.ccFlags = [ccFlags, "-Werror"].flatten() LINUX.glass.linker = linker ! LINUX.glass.linkFlags = [linkFlags].flatten() LINUX.glass.lib = "glass" LINUX.decora = [:] LINUX.decora.compiler = compiler LINUX.decora.ccFlags = [ccFlags, "-ffast-math"].flatten() --- 142,153 ---- "com/sun/glass/ui/gtk/*"] LINUX.glass.nativeSource = file("modules/graphics/src/main/native-glass/gtk") LINUX.glass.compiler = compiler LINUX.glass.ccFlags = [ccFlags, "-Werror"].flatten() LINUX.glass.linker = linker ! //LINUX.glass.linkFlags = [linkFlags, "-lgio-2.0", "-lgobject-2.0", "-lglib-2.0" ].flatten() ! LINUX.glass.linkFlags = [linkFlags ].flatten() LINUX.glass.lib = "glass" LINUX.decora = [:] LINUX.decora.compiler = compiler LINUX.decora.ccFlags = [ccFlags, "-ffast-math"].flatten()
< prev index next >