From 76549d0a4a1b146c037de62ac2dbf7cfde006540 Mon Sep 17 00:00:00 2001
From: Mikhail Titov <mlt@gmx.us>
Date: Wed, 25 Nov 2015 14:14:26 -0600
Subject: [PATCH] Fix win32 resource compilation with msys

squash! Fix win32 resource

winres.h is missing for mingw
---
 Win32/Resource.rc    | Bin 3294 -> 2602 bytes
 Win32/resource.h     | Bin 904 -> 451 bytes
 Win32/winres.h       |   6 ++++++
 build/CMakeLists.txt |   8 +++++---
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 Win32/winres.h

diff --git a/Win32/Resource.rc b/Win32/Resource.rc
index a4fa890b129dafe6d1ed2497070a94f247581074..e8b77bef01dc1ac2e75324d75bcbfde476e782d3 100644
GIT binary patch
literal 2602
zcmcImOK+n{5WZXTf2bvwM8jf?Glv{8U@r;*%NT1SMMAyMwtIye)U+oXX@2}xW6a>J
zH?s$)4;EdouKMcb(FmScCd#_pNLaJ_Knifae1R?HR1isX5VS52BBM}ef>qKO4o0Kl
z;D+(6IOG(x6W`cr!vQjKx?!Axy@*$d>qqI*v)w2Rp40gGX&MEw(!b(4x-%NVyz_V?
z%00*(g_ZYh<%dp?xE@$tApeTsm2nKB_5X^lH8>qO0`d_WpMVE=d|R-32e%1lDu=Pe
zRMvML1a*@swt?S{*~)M2**DBo93@M~OWh#2gC9Sj&s^EddFqA9-Ea`t;XJYD9;gqb
z%>zIFLx(t-_6cc%slKTM+3pEsWlqzIZ0YUT`f8yKRY99GWc+X)J$mjZz@bd`YvEWj
z!@;;ugyCT7&HZpV06e{_elfAGy$~H64y+F}es+Y`6_oZOUO1{ZCi{ja9~k;Cog2z?
zOc@>wr)#ecHs#-yi&qsezU5~nKVjBh;g!i96y+<eCHO9UC&ht6Rges;ZNmgoWeJqm
z2SI^URlzbMS;>L5wy+fUgz*|HgV(H<luJN1DGI3H@Vc+DO`mK(^qnYFG560Un&N9L
zlVw>kYTz@?H2NGs)>PCO%n6fqoUXlP>_=hhhqDOUi~7dY&-}n^DPZYi-PBE_E|!s-
zII9!G)E{(f(r}dgEU@SClN~>T`S)ZKbj^~w-ZYuFMjIg%7%M(4YWj|DHgr`pEhCCi
z`rb6nd*n2Jt)3TNYoWPg3%4Yt-0O#F5IK*a#ZoZ7ow0)Ye4`LnsQ1L0>rvFaHy_OV
zKUMQ6sygok6=`h;i3gff?kmFILb9it4%*@%s)B-VEqdBLapizZkNXJopj6b(LV3su
z-6Q4aqwmz()F~Cq7#pV1cd#exb4dj!#mS{*y9EuAT{a%jEh(I`dJ}BBlZ{KK3*0()
zV435|@A&gohZU}-V~EP*g(&}`nY?T@LTe1&P!aPM9cESeWoa~(A2NCJ`ByNu;yp-A
z<H4{dXP7jTPXW_?w6(A%;^RVSbGs6R*G1F)h>9w}2OY+isk-1~wjHl$6YhWPuq$`B
onxIXqov-X}!e05gcDnxJf6Js>+BguE$|ubEGu(M8FK(BA004PvJ^%m!

literal 3294
zcmds(ZEq4m5Xa}WiQi#`H*GYa_7ju`2`QzfK&uG}At03q9O1ym#IM`0q5fu;E!T4A
z1N!1(Hg~f(H@iCz|Cycd-^x-JC+9Mik*p+=m}equcvtXZ*~n04d{yN+!^w?&kOj{Q
z{u(-lw}R@r4YLt*$CvIll_fGIc`8phrEIhacfsEo(qoe??5!`!M=6-Jt}L3|#MbHF
zr}9=h(v_anq$w9NkV~n<tub#)OWwoj@IIFcoEGzNzUq*_5wr``Ndvz;_VENSMKZ_!
zHQrG_bg}v!?<Q7Pu~Yp~hyR-AaYTL{gIn{jU-!`e`SV!N$fIL}uM|lW>^=+|!Si9?
ze9@qtBhC?#y~WlWqBX?s7uZ~Z`w3*+S)Lx<OAY0V9H(F*PGr{9y!PxthK=P2KfVE5
zKC?PxQI8y}g02A=YcX`+uMC&DvdbQqAbEg37tD_B)E3+}+#a-HXbqeocMZ1zrd3X@
z>mXa<M87UgYG8SOM!ugSr{40oP}{O`p;>c<W@nsNvlaP@dQzK!fIzcyKm1p!&nx_w
zRVDO)W$Wv<Njs!<q}SuVyxi90I-c_$(>=7>9CAk5Jx~DKdOIYmP(k{9_u={*VW(x5
zMkfbq^rz<(txAv4SSybo8nv`4w2!tBqhy@(HCGK)qd*;5Iil7q?m0;tc7L5kQEw?n
zMT)Fm#nw?Y!Htv8)=_Ni4qGBIw4Oox2)*N1^bXp6tXb*I!`g!=A{>%S#tf+u^EFhp
zarT|m%in)<WE4#?5?=3^Z{1yQS3Se8*8WC2oS1s)|IVTQ#?+dkv1?NOw7Up#PN%;o
zwOd;-&DGKfyQb(>GETI`dN#uT<xP+;)FrhE_zF~O#)R1YuT}l;`aZ3DKkxg3ACo@L
U*IYHsM*V_3(Y)R7^3v<;58y9~*8l(j

diff --git a/Win32/resource.h b/Win32/resource.h
index 661a5bafe934e510a47acc370bb204f1565ef86f..7bb73d3808ea77e3468b0f5a769e110a185ec3e9 100644
GIT binary patch
literal 451
zcmZ{g&5DCC6ovPK?{J~ZLe<h2a7-3qG%5ZuT?MN*Lk5Xpbbcs(_eo_+Y3XDWxc56J
z=OhSDCoUwRd&&vr38TgN?0Z1~nQq6y4r+p0+qvl>S+C(84UWx(9ca_`bBCaGkDEnM
zSvNlZK#q2p#}+qZdzt&*szap>0wYYaMDPfnpD2ucZ?WR|J%Lj-b3egn)6Zx@4I>!*
zg5mgq?PM3ud28i3i1$TV5hf(#wRojuS(v*`PGcf?dXU8-dl6}I%O#y!a{5-voED<W
z6DsRCt>`sn6mFlviO8~;lY16+VR)%=?R@ig#miiz4|wzs?LyK=Yk=j4R%kk{+!KHI
EFDV~;hX4Qo

literal 904
zcmb7?-Acni5QWdR;5#hzQm|Hhf!gGv*rw7y^eWicNTpb48h;R9UHxX)(pGA)44c^*
zX3w0NldsRZ>Uzf#^^_`7tZPo<Z;4uJ6Ako%9qWkNx}3V2DbrF56`Wiva$|CZO5JHr
z)Y1v&^q{GpI7{*?{5`oDnT)EEXiA)unR7ec>M#N;R8RCqO`phml^|ul*8G~0`I<*F
zEbHgs9dS}li^&o-$Q@!0o$<zy*IgVaQ@#3Wjd{*YCCqL5XFqpIwjj!3y2Klk7yLpK
zJ#x>eEw=Ci?-}(0&#B4w2O4VR*_$G5x{jIP3LPT<w#JM(*nhw2Q`@B4=I-bglmXwa
zF3EJb@7q`U(>vu&tQ$C_Y~8f)!KTj^V=`l^I>a$k?V9cD{NKo?Nf&F<Evm$Ix&YZM
rsPS9peY}I>Ls;9qRjeJThhc|Jnikc#ww=vCR6~7J%#;h;-;KWkR}+1N

diff --git a/Win32/winres.h b/Win32/winres.h
new file mode 100644
index 00000000..e9afee91
--- /dev/null
+++ b/Win32/winres.h
@@ -0,0 +1,6 @@
+#ifndef WINRES_H__
+#define WINRES_H__
+
+#include <winresrc.h>
+
+#endif
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 46213363..1a378cbf 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -104,9 +104,9 @@ include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX11_SUPPORTED)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" CXX0X_SUPPORTED)
 if (CXX11_SUPPORTED)
-  add_definitions( "-std=c++11" )
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
 elseif (CXX0X_SUPPORTED) # gcc 4.6
-  add_definitions( "-std=c++0x" )
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
 elseif (NOT MSVC)
   message(SEND_ERROR "C++11 standart not seems to be supported by compiler. Too old version?")
 endif ()
@@ -138,10 +138,12 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR MSYS)
   list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonWin32.cpp")
   list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32Service.cpp")
+  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Resource.rc")
 endif ()
 
 if (WITH_AESNI)
-  add_definitions ( "-maes -DAESNI" )
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes" )
+  add_definitions ( -DAESNI )
 endif()
 
 # libraries