changeset 4965:61ded8479309

RT-32701: Debug build fails to build T2K on Linux
author kcr
date Wed, 04 Sep 2013 09:43:07 -0700
parents c590bf86c848
children fd5c3a88cd07
files buildSrc/armv6hf.gradle buildSrc/armv6sf.gradle buildSrc/linux.gradle buildSrc/x86egl.gradle
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/armv6hf.gradle	Wed Sep 04 16:59:52 2013 +0200
+++ b/buildSrc/armv6hf.gradle	Wed Sep 04 09:43:07 2013 -0700
@@ -420,7 +420,8 @@
         file("$closedDir/javafx-font-t2k-native/src/layout"),
         file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
 ARMV6HF.fontT2K.compiler = compiler
-ARMV6HF.fontT2K.ccFlags = fontCFlags
+ARMV6HF.fontT2K.ccFlags = [fontCFlags].flatten()
+ARMV6HF.fontT2K.ccFlags -= ["-Werror=implicit-function-declaration"]
 ARMV6HF.fontT2K.linker = linker
 ARMV6HF.fontT2K.linkFlags = fontLFlags
 ARMV6HF.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/armv6sf.gradle	Wed Sep 04 16:59:52 2013 +0200
+++ b/buildSrc/armv6sf.gradle	Wed Sep 04 09:43:07 2013 -0700
@@ -436,7 +436,8 @@
         file("$closedDir/javafx-font-t2k-native/src/layout"),
         file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
 ARMV6SF.fontT2K.compiler = compiler
-ARMV6SF.fontT2K.ccFlags = fontCFlags
+ARMV6SF.fontT2K.ccFlags = [fontCFlags].flatten()
+ARMV6SF.fontT2K.ccFlags -= ["-Werror=implicit-function-declaration"]
 ARMV6SF.fontT2K.linker = linker
 ARMV6SF.fontT2K.linkFlags = fontLFlags
 ARMV6SF.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/linux.gradle	Wed Sep 04 16:59:52 2013 +0200
+++ b/buildSrc/linux.gradle	Wed Sep 04 09:43:07 2013 -0700
@@ -220,6 +220,7 @@
         file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
 LINUX.fontT2K.compiler = compiler
 LINUX.fontT2K.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
+LINUX.fontT2K.ccFlags -= ["-Werror=implicit-function-declaration"]
 LINUX.fontT2K.linker = linker
 LINUX.fontT2K.linkFlags = [linkFlags].flatten()
 LINUX.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/x86egl.gradle	Wed Sep 04 16:59:52 2013 +0200
+++ b/buildSrc/x86egl.gradle	Wed Sep 04 09:43:07 2013 -0700
@@ -385,7 +385,8 @@
         file("$closedDir/javafx-font-t2k-native/src/layout"),
         file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
 X86EGL.fontT2K.compiler = compiler
-X86EGL.fontT2K.ccFlags = fontCFlags
+X86EGL.fontT2K.ccFlags = [fontCFlags].flatten()
+X86EGL.fontT2K.ccFlags -= ["-Werror=implicit-function-declaration"]
 X86EGL.fontT2K.linker = linker
 X86EGL.fontT2K.linkFlags = fontLFlags
 X86EGL.fontT2K.lib = "javafx_font_t2k"