From 0f75ebb5fa7a12bd1df26622ed3f5544a9d1d32b Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 11 Aug 2018 16:12:54 -0400
Subject: [PATCH] First step toward alpha 4: we no longer need the Windows
 resource trick.

---
 libui_windows_386.res.o   | Bin 1952 -> 0 bytes
 libui_windows_amd64.res.o | Bin 1952 -> 0 bytes
 link_windows_386.go       |   2 +-
 link_windows_amd64.go     |   2 +-
 main.go                   |   1 +
 static.rc                 |   3 ---
 static_windows_386.syso   | Bin 1308 -> 0 bytes
 static_windows_amd64.syso | Bin 1308 -> 0 bytes
 8 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 libui_windows_386.res.o
 delete mode 100644 libui_windows_amd64.res.o
 delete mode 100644 static.rc
 delete mode 100644 static_windows_386.syso
 delete mode 100644 static_windows_amd64.syso

diff --git a/libui_windows_386.res.o b/libui_windows_386.res.o
deleted file mode 100644
index 4b03f6437e49e547fbfef0bf15ab6eff2bb20408..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1952
zcma)-PiqrF7{;GTBHL7IduYLfN(v#jO7YNxdN3_$T4S?qY)xylrfHC-Y1LFT)yt+J
zh#-O|KZ0LC=s`rNl%51{9y|y_@DF(D2Uwq($!<2=tj&bY%+CAl?|t8SXLr&<K(-eK
zphppLwz^p@s#*OvO4~&aE9_+p^SXr5k8<2<0>^lB60llxaui1Dfz-pAWS?U{#s2;w
zoj^1KJa2!PcY6L!!2Daz@9>Iw>|Z(lrjt>#J0YM(w$lV`TaPJ<z|`XvtTY8JJMann
zRxkQ6h6C&?`(@n21|D)8mG>fx67F)Y#2Dr<sWi@C$TVPJnMzx=Z6x44f8G(PK6!kY
z+5u|Q_{jyf?PqOvAY@j_n)0w5QVg4nCxI<g7=@49JIv<>_*@#l0=RqR#y#8wvRK8F
z!z{+QM^>Dy-yK*6V>D2}59X-zwMZ&poz<3+d0U-ZB8oD;b7%cgtZgKz9p?%xFq1|4
z_cnpB`4aCif)i?=+O~xZu6iXLhs_U74NJ}#EKHEOfg-(ET&=&pr&N7&;)_yDu$C2G
zRo)$4VOB}ico(}!bC22f|MQUg&s^_*>aTU7x2SJWzviir$=FJG#2S_G*jI1KZ?Hyd
z7{qkf{E;?(hV?3N%~rXqwmS01sP9Ln3%=a94a}g2zkE}lK&qX}Vp*u0e=&_Stgoqb
z+#zjEa+Vb5mdnWoaPo>X6UbRtoZBvEK7dnJoY?@*kkEN8xt!UKoYO+*mGyIE-m$uQ
zf%ZY>ecf+Y`G?FQq4U1u`neL|N9R4~=eU0I%Fn#t?)uT|QgHo@2l&zJa>LJY{gjoT
zoZs&Hd8*cb+4YkQ@KaOkzu@P%ern3kqTk;1(<ff@P3S?f=_keaC4pLiuU9z78r<x_
qlHZ;Kyg%~W6Bk;;@H&2boU_e<bD9~D=a*~-yr(YDC7zoM1^)oC>mg|X

diff --git a/libui_windows_amd64.res.o b/libui_windows_amd64.res.o
deleted file mode 100644
index ddcddbf0eeb62bc390a51c882825843ba064b5d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1952
zcma)-PiqrF7{;H?M$%MjduYLfN(v#jO7YNxdN3_$T4S?qY)xylO_Lx^)2gXxs+Ubc
z5kUk`egwaO(1VCjDLo0^Ja`a<;2-eP53oKnliloYvo;epGdu6IzxRFTo!u!t(;(W5
z2%tt`oULuvigH%{jna0J!zz2xbY7P*`caJAO~WzXoCM7FoEYgy-4}Y8lk9Wsr`X>+
zq|*=$1JAt=^G?mb37CJ&`5j&{m;Ecp-&8Vkb|(bX$+nvY%Ti;C!Z6ghgi=e;wgaEA
zZ}y@OV>rORv|q+uY~TUMQE{(jQN|t4l^MevCZ)#y3mFkautKFJ+cpxgpFeMlWS=}f
zOzi-*Y5e2@Th>#L9S9jUvZh=tn-s$)<4Ir(RYu|C_73y80X~<;uK?~Ixp5aafh<<>
z_%Mqx?vWKI>vsoMgfT`?zz^oA@-;~+V4c+#k-1xgTOx`IzH?{&k*sYbsU7DEEHINr
z`gb=Cy73b4FoF|upIVlQ46eE*9P7r1mWCx~3??SX+(41utB%%R-&3-_Iqi#7Ot6+!
zUNznwU13&9)_51YNOO-_*8lSm`p;bNe(JAvp*N{-QorV^kHOf=c*q)+@yJ(i!Edrg
zYZ%0I*ZdI=Kf`(zxMr)|Ra+hTW7PK}(*<Ab+a_kv!(YCoPax%`vREb>#$Qb14C`x1
z9e0SQ3C@z_+;TYC08U<VW&%0ul5^YP%m;8Pk~15?8PZf<OAcqYBj>cH^2+)-BJWtk
zxIp_L^S<u4%lt#ekf!opcKlok@T2mc^K%?OdFf}~Z+HBtbtyQ0#smDQb-Cf^IDRV9
zPtI?5{5+BCzvB2w2KcGV^<VIF96xpGXVGtO`RUVM^G)bMvE?Vl_a%XPfUj3L#~R%1
qz!Kk{1H3=-+Y{H6hT(Pm_Sk2e4*N9IA<i$+bkC{FbBQwy1^)n5tReXT

diff --git a/link_windows_386.go b/link_windows_386.go
index 776b481..d617a20 100644
--- a/link_windows_386.go
+++ b/link_windows_386.go
@@ -2,7 +2,7 @@
 
 package ui
 
-// #cgo LDFLAGS: ${SRCDIR}/libui_windows_386.a ${SRCDIR}/libui_windows_386.res.o
+// #cgo LDFLAGS: ${SRCDIR}/libui_windows_386.a
 // /* note the order; also note the lack of uuid */
 // #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -static -static-libgcc -static-libstdc++
 import "C"
diff --git a/link_windows_amd64.go b/link_windows_amd64.go
index ad2d1a2..73c94af 100644
--- a/link_windows_amd64.go
+++ b/link_windows_amd64.go
@@ -2,7 +2,7 @@
 
 package ui
 
-// #cgo LDFLAGS: ${SRCDIR}/libui_windows_amd64.a ${SRCDIR}/libui_windows_amd64.res.o
+// #cgo LDFLAGS: ${SRCDIR}/libui_windows_amd64.a
 // /* note the order; also note the lack of uuid */
 // #cgo LDFLAGS: -luser32 -lkernel32 -lusp10 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 -lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -static -static-libgcc -static-libstdc++
 import "C"
diff --git a/main.go b/main.go
index b908e0a..dd1443a 100644
--- a/main.go
+++ b/main.go
@@ -27,6 +27,7 @@ import "C"
 // make sure main() runs on the first thread created by the OS
 // if main() calls Main(), things will just work on macOS, where the first thread created by the OS is the only thread allowed to be the main GUI thread
 // we might as well lock the OS thread for the other platforms here too (though on those it doesn't matter *which* thread we lock to)
+// TODO describe the source of this trick
 func init() {
 	runtime.LockOSThread()
 }
diff --git a/static.rc b/static.rc
deleted file mode 100644
index ca23375..0000000
--- a/static.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* 5 june 2016 */
-#pragma code_page(65001)
-1 24 "static.manifest"
diff --git a/static_windows_386.syso b/static_windows_386.syso
deleted file mode 100644
index 46c6ccca8f0f39568b1ccf7f9f1049426b0022f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1308
zcmbW1UvJYe5WrJ0K=c#v=;aZ~Y0@TLJEh&GO^As<Lt+egbnVL;k=T*#u2cw#kG2oS
z1LvfFQh}JnNr~<AoqhMalizeYo|7k!J+GM^bOLQOueHtZ{=oB6oc_YmiL*QP!h1L0
zNymGR3;cfWbZ*wE?Zdz5pW%70(Bd<G^Yz)zBR%<67UT}J$(5Y=Q4snBBv&Grw-f*4
z^-DVPiLp!yRwxM*e+9-rnRZiV43x8CMbKZGiNDbD*zh@&%+NCDS{apD%2j#HOc~ro
zJ}H^ZGcfk1eOc?IO99g6cGV>)?TCU9qpG!)Rve5``b_hAZh_l{#+Y6-yONc-I9FxG
z<mw$Rg7;d91-JG5i(2Tjsw#5MEauv{*j0rt%Ullnez%9g2ryjdm9v;S55jgXq_s)r
zpdm<mEfsnnQc9LUF0P0K5CpU5wiuFJ5<3Tn(dL|RW`IyyUsi#{todqMr-!#U3VXJu
z+vpvTE$}@|ZpX=99*wH`H%#7c3KD$ErBF)~Af-}Cdak6^sxS?WjpG*n(4pVJ-|YUo
z2wSVg3{k&^)wTKx*jdA5oXm!C6vv!rk;wLMESS7qu-jcN-7#1XH#o?DVA&}hyc9`S
z2zQnj*gy}r<es@}&h<^LVz<a2QhJT$ySyMXDAW?mDO?kQ*=r87s4Ar`$&@B*%H$@;
zn%A{<i8x8uW+1LUkV`S~ze7KaqBuFCQ4$YnJm3jsNd`0wM*;u_VvvPD{56aEi2sl0
z=z&-UNi-PE#*8LnjIm@hK}XORl=b5{?DvywJYd^c(%v4fw6{kUi_+V?5z}thy**Bz
PdhHj_y>5>@_Z<BO88T<^

diff --git a/static_windows_amd64.syso b/static_windows_amd64.syso
deleted file mode 100644
index eb56b3b10a22b6e6e37a3e4f0d7db6d64b147499..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1308
zcmbW1UvJYe5Wq7rkmx7i(aR%})1*zhc1k;@O^6A>kQf6VUHh^|Bz9ywD-}ZGiO;nU
z#slZ1{~{2RI4QAxzO(Osce40-;5m8n*z?-ip%-YQd82KA_lKUB;`A4ePMqBfFT8j2
zog8@2aDm^CozBe;8vF1s`loo_E4288-(r2X^GHv>mIb*3ZE_{2eiVd00m+rf<?Yn}
zaQ%{wePS$=f)z@_)L((|PiMW983X0KSP}G>X6n~ko*2G>k{Md&Tq~n8OSvjfm??w1
z$R{O}c?QPb>|eHb(xm`tbGzyhl>LZ;5Tk0el~x>#QTj~tMQ(xHT4PMl+g-^@T%4=2
zVsiBs7r{HNM9pn8|Ey|#R#ipLnZ;aN7rUy^Wtq$2!0+`j7y*XsymA&Z=Rw%ch3svT
z1!xG;{+<fGk0>QeAQx9e0tkZHb6bo^E{R=$!)S9(I5R*fZ7!=oV%B^$YtqBpTZKJa
z({1$*$QF19liP99$)i=Z|CY&{O+kW>xfE(?0;E(bNzawES{0_Hv2onOA35|J_?z8-
z7h!8v&k^-&SY4|xfSol;CdqshM{&$~7KyBTW5MKY&2D$KbjM&l+~6Spfn}$3@KPjQ
zA>4UhU;{nek{xr`oa>wRioHkvh|+5;-{l3FL!p*fPT`seOs6?aT~$h3k||Brl*vtw
zHE(L|5^<8Q%|KkeCzoRCe}h37MR9UWqa+^Dc*qmVk_>1Vjs*Y=#V`xM`)d}>5&s|0
z@dL38lV~`ePZ&+a1Y^nOf{tMzC>z9aI2a_^WXQI$r2P)AwBMnMMd@$eh*_`a-X159
OIxn7k-5z=FIr<GXooI*v