From 26bd990227faf8ecdd2b4029a7f28af119972549 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Fri, 21 Apr 2017 00:39:33 +0200 Subject: [PATCH] Fix linker issues on different Windows architectures. --- .gitignore | 1 + rsrc_windows.syso | Bin 92055 -> 0 bytes rsrc_windows.go => rsrc_windows_386.go | 4 ++-- rsrc_windows_amd64.go | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 rsrc_windows.syso rename rsrc_windows.go => rsrc_windows_386.go (53%) create mode 100644 rsrc_windows_amd64.go diff --git a/.gitignore b/.gitignore index daf913b..b97897d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o *.a *.so +*.syso # Folders _obj diff --git a/rsrc_windows.syso b/rsrc_windows.syso deleted file mode 100644 index d3c5c1dd6f71422ecc0b84b47276755210ce2c25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92055 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 diff --git a/rsrc_windows.go b/rsrc_windows_386.go similarity index 53% rename from rsrc_windows.go rename to rsrc_windows_386.go index f40003f..dc67cad 100644 --- a/rsrc_windows.go +++ b/rsrc_windows_386.go @@ -1,5 +1,5 @@ -//+build windows +// +build windows,386 package main -//go:generate goversioninfo -manifest "rsrc/app.manifest" -icon "rsrc/app.ico" -o "rsrc_windows.syso" +//go:generate goversioninfo -manifest "rsrc/app.manifest" -icon "rsrc/app.ico" -o "rsrc_windows.syso" -arch 386 diff --git a/rsrc_windows_amd64.go b/rsrc_windows_amd64.go new file mode 100644 index 0000000..4cf9aaf --- /dev/null +++ b/rsrc_windows_amd64.go @@ -0,0 +1,5 @@ +// +build windows,amd64 + +package main + +//go:generate goversioninfo -manifest "rsrc/app.manifest" -icon "rsrc/app.ico" -o "rsrc_windows.syso" -arch amd64