From 0fe8b2b30f1bc002b33b6c45fb2db2c45ac728de Mon Sep 17 00:00:00 2001 From: mappu Date: Sun, 27 Oct 2024 12:46:44 +1300 Subject: [PATCH] qt/cflags: merge and combine qt 5 cflags files --- qt/{cflags_windows.go => cflags.go} | 4 +++- qt/cflags_linux.go | 9 --------- qt/qprintsupport/{cflags_linux.go => cflags.go} | 2 -- 3 files changed, 3 insertions(+), 12 deletions(-) rename qt/{cflags_windows.go => cflags.go} (53%) delete mode 100644 qt/cflags_linux.go rename qt/qprintsupport/{cflags_linux.go => cflags.go} (77%) diff --git a/qt/cflags_windows.go b/qt/cflags.go similarity index 53% rename from qt/cflags_windows.go rename to qt/cflags.go index 696a7616..f10f6a66 100644 --- a/qt/cflags_windows.go +++ b/qt/cflags.go @@ -1,8 +1,10 @@ +// +build linux,!android windows darwin + package qt /* #cgo CXXFLAGS: -std=c++11 -#cgo CFLAGS: -std=gnu11 +#cgo CFLAGS: -std=gnu11 -fPIC #cgo pkg-config: Qt5Widgets */ import "C" diff --git a/qt/cflags_linux.go b/qt/cflags_linux.go deleted file mode 100644 index 51e34c25..00000000 --- a/qt/cflags_linux.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build linux,!android - -package qt - -/* -#cgo CFLAGS: -fPIC -#cgo pkg-config: Qt5Widgets -*/ -import "C" diff --git a/qt/qprintsupport/cflags_linux.go b/qt/qprintsupport/cflags.go similarity index 77% rename from qt/qprintsupport/cflags_linux.go rename to qt/qprintsupport/cflags.go index ebb10b1d..94670d68 100644 --- a/qt/qprintsupport/cflags_linux.go +++ b/qt/qprintsupport/cflags.go @@ -1,5 +1,3 @@ -// +build linux,!android - package qprintsupport /*