From b4196266f28c34c70dc930aaa32500fc71458253 Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 5 Apr 2013 13:54:18 +0200
Subject: [PATCH] windows: fix resource files and backwards compat dll names

---
 project/LibCecSharp.rc                   | Bin 0 -> 4592 bytes
 project/LibCecSharp.vcxproj              |   4 ++++
 project/LibCecSharp.vcxproj.filters      |   6 ++++++
 project/libCEC.nsi                       |   2 +-
 project/libcec.rc                        | Bin 3202 -> 3946 bytes
 project/libcec.vcxproj                   |   1 +
 project/libcec.vcxproj.filters           |   1 +
 project/resource.h                       |  14 ++++++++++++++
 project/testclient.rc                    | Bin 3230 -> 3980 bytes
 project/testclient.vcxproj               |   1 +
 project/testclient.vcxproj.filters       |   1 +
 src/CecSharpTester/CecSharpTester.csproj |   5 ++---
 support/create-installer.bat             |  11 ++++++++---
 13 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 project/LibCecSharp.rc
 create mode 100644 project/resource.h

diff --git a/project/LibCecSharp.rc b/project/LibCecSharp.rc
new file mode 100644
index 0000000000000000000000000000000000000000..7c69374bc7e911b5ff9ae5da9cf1b2451e7d0b72
GIT binary patch
literal 4592
zcmdUyYfoB15QgV-lm3TO{L-e1p#A{`q^2lFE@=}Jf?Slu0^yQq(%;_pncXvTZeYYO
zG$)6>oSoTs-ns1Z_s^jmN+6dqlAg?DB6HrMESPIEH<zV!<&jZIzVZZeF9R9#&X`}&
z_L-Z}s@#%ZkAA>NwT)!Tn!J3J5A1U2+C65+e0^kf->uE1<n!_%Ik#FR_uRUnlT+QN
zaxD#MN=wReA$94<jZ~N|)4!6M{A8xV@1>kEQ=@PDD~8>B44t)sRN*Db@er0K@(cSH
zu%kRQvHAzU7g$}wPUWM*{1I=`Bd`0Qi`Sn*xj6s3$Cx4V(XoUpjie!VZx<WJyy@Mo
z*3bp`cZv6V_&<=(czqDY!i;R{Iu_>gCByskNG^>WPoH8r)koW@oD)qxmm1_vi>xXU
zPaSrx@u=S4Ji%JYCOU42-Hyw`G7^fs#_ScdE!wJ!Pn%KAE#kK%-((-X4Mt}#>!V*)
zkG@(vh8ujXna~FNclIg&cUhmE&*pvOpa@ghD+6co8MaqlO;Cv-e6nlotrWsKTY)*x
zm`Z5{*=CQd+MXjala(bWw^W*2BGy;=70Pvpj<-bg)_wL|<?XvTGgMj)vMNhD+RR70
zRX?I=6rql-)l**2@;Mey@Q2NtC2g{@!<q`2-EgPv6=SvhoIF$M=ogz;>3|g%WOF64
zM$e~xDTZ&s?HF*P-=I(HL5awVYt5E0?dPsyR6%!1g=vuc0a5)V$3$JtX^&S8tt%Dk
zOp7du<6LR-8j3IS1M2G>o;I&9MAqwxq_rw8Q3s#beF8>(PC}U#TTN~**C6!kj#A%!
zm5i^lowIXaYib={m6;p}7WiB5VE1@vgk=N#GzRM=k&W5fEGyz#y*1vVJM4<*^-3nI
zHrZEe+xSs$Gs-~@+<NPoy7TRsxa%?+Fs~;@4yKl&Zw^>L!lno83y@#nf&3aA**h5<
zW%NhyuRb$u#~Qobfoi}x++epZY)-e@C!Tqx{|MB@@Lk7aHh%S@-pFUPdS_2^l|-J0
zp+}x<UuEx6L;t<gu6~)yvx_Cqx>=C^qPLZvyFt9>FU|D=_7~+K>>a-eUp>U5@vR(~
zPjwWHn<N+Bi`y`A&5je8Tw>wkRnFfYEph$Z$IR-4H_xVL;yK-hv)K!S+ti47CO6Th
zx70a)(f^LoywZwYa5-Icez$YMV_hL#^|Z3CKds+)Q;wdPyVX~#qpv^PHvRue-%@tV
rq9_`*Ovl!~_n)xd8aMwFHZG$mcB`)l*T?yo+N0-P`hRcQ@2cq^<<cJ&

literal 0
HcmV?d00001

diff --git a/project/LibCecSharp.vcxproj b/project/LibCecSharp.vcxproj
index 5170df8..96ffaed 100644
--- a/project/LibCecSharp.vcxproj
+++ b/project/LibCecSharp.vcxproj
@@ -198,6 +198,10 @@
     <ClInclude Include="..\include\cectypes.h" />
     <ClInclude Include="..\src\LibCecSharp\resource.h" />
     <ClInclude Include="..\src\lib\platform\windows\stdint.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LibCecSharp.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/project/LibCecSharp.vcxproj.filters b/project/LibCecSharp.vcxproj.filters
index 8b00571..b669706 100644
--- a/project/LibCecSharp.vcxproj.filters
+++ b/project/LibCecSharp.vcxproj.filters
@@ -34,5 +34,11 @@
     <ClInclude Include="..\src\lib\platform\windows\stdint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LibCecSharp.rc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/project/libCEC.nsi b/project/libCEC.nsi
index ee5a12e..36ade3b 100644
--- a/project/libCEC.nsi
+++ b/project/libCEC.nsi
@@ -153,7 +153,7 @@ Section "CEC Debug Client" SecCecClient
   SetOutPath "$INSTDIR"
   File /x p8-usbcec-driver-installer.exe /x cec-tray.exe "..\build\*.exe"
   SetOutPath "$INSTDIR\x64"
-  File /nonfatal /x cec-tray.exe "..\build\x64\*.exe"
+  File /nonfatal "..\build\x64\*.exe"
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
   SetOutPath "$INSTDIR"
diff --git a/project/libcec.rc b/project/libcec.rc
index 0f65c996e1e71a34e343e11233905d17a9ca1645..2fe223a34754134a8b30d39b8ded603153a02f00 100644
GIT binary patch
delta 386
zcmZpYd?h!b$X=NtlOc~GnIVUvlp%#7l|g|)iJ=Hc7c=AoMT&qjsSJ7y89-591}-pG
z2CGX0>r0*3C@LSs;L700;KJa~;K$&@5XlhF5DX-J8JvJ3J`BN=8@b*y8ci<bR#e4i
zSt3IkLj}}Iutk$6a<61AWyqUYEltSijk&Ijy4YMB!(ae)u`AF~E^xOSO%7y~oIHh5
zP92+5lo&7_v!2nI(HNv_^AyHijI0I>It+%BgPC=qtn<v0ljkw7;WPnS2!bY?y;*#j
kfRcJZWeeGLH=kmA2hs)NDzb`Ce#RjL#D_KqaTzcH0J7*#UjP6A

delta 93
zcmaDQ*CaWiXfqqL1LI~J);Wx<h739k29xiy=|Wlj>_-_5Hs59UWnwmD(3`xGLvnHe
mC&%Ou9DJK&xZW|s1uJ-jCRgwrnykV!kC~T&YqKG*B@+O*pBX{`

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index 9d2bb9a..b2af3ea 100644
--- a/project/libcec.vcxproj
+++ b/project/libcec.vcxproj
@@ -69,6 +69,7 @@
     <ClInclude Include="..\src\lib\platform\windows\os-threads.h" />
     <ClInclude Include="..\src\lib\platform\windows\os-types.h" />
     <ClInclude Include="..\src\lib\platform\windows\stdint.h" />
+    <ClInclude Include="resource1.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\adapter\AdapterFactory.cpp" />
diff --git a/project/libcec.vcxproj.filters b/project/libcec.vcxproj.filters
index f966a2b..1b1cb37 100644
--- a/project/libcec.vcxproj.filters
+++ b/project/libcec.vcxproj.filters
@@ -179,6 +179,7 @@
     <ClInclude Include="..\src\lib\adapter\AdapterFactory.h">
       <Filter>adapter</Filter>
     </ClInclude>
+    <ClInclude Include="resource1.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\CECProcessor.cpp" />
diff --git a/project/resource.h b/project/resource.h
new file mode 100644
index 0000000..33017f8
--- /dev/null
+++ b/project/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by testclient.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/project/testclient.rc b/project/testclient.rc
index 20d3b9090f22fbf33a9b10ac4c9f43c79ffc89fb..acf44e0717bf1ce81fe02934fe0aa2c0142992ea 100644
GIT binary patch
delta 388
zcmbOy*&{!p$X=NtlOc~GnIVUvlp%#7l|g|)iJ=Hc7c=AoMT&qjsSJ7y89-591}-pG
z2CGX0>r0*3C@LSs;L700;KJa~;K$&@5XlhF5DX-J8JvJ3J`BN=H*znY?7;2AXf(N(
zTTvC8g^3Jl3>8po!In*yXIjpx40J%=#A<0m7HrIQWt7C`<`@P82BpaxIfa2%7jjEa
zp2jGnj?H={222O6XEbIs2I<;7jd2Gfs{w-!gW=?0W?d-jJhSBFdCY4#O@LN_pvh)$
t7I!9~q#jV2BCGi11FT}3kFd>RWX%BvRMO;Fj&dZ)4;)uE=W!V@0RW})Q9u9y

delta 89
zcmeB?pC>t?XfqqL1LI~J);Wx<h739k29xiy=|Wlj>_-_5Hs57;XJR&F(3`xGLvphN
i*9OMP-?+<Q0+VO)2m$e-$tq0qn0XnvHV5-sG64WdJs5-l

diff --git a/project/testclient.vcxproj b/project/testclient.vcxproj
index 4ca804f..2a143ad 100644
--- a/project/testclient.vcxproj
+++ b/project/testclient.vcxproj
@@ -172,6 +172,7 @@
   <ItemGroup>
     <ClInclude Include="..\include\cec.h" />
     <ClInclude Include="..\include\cecloader.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\platform\windows\os-threads.cpp" />
diff --git a/project/testclient.vcxproj.filters b/project/testclient.vcxproj.filters
index 0fd21fb..d1cdfda 100644
--- a/project/testclient.vcxproj.filters
+++ b/project/testclient.vcxproj.filters
@@ -15,6 +15,7 @@
     <ClInclude Include="..\include\cecloader.h">
       <Filter>exports</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\testclient\main.cpp" />
diff --git a/src/CecSharpTester/CecSharpTester.csproj b/src/CecSharpTester/CecSharpTester.csproj
index a02548f..9ac4261 100644
--- a/src/CecSharpTester/CecSharpTester.csproj
+++ b/src/CecSharpTester/CecSharpTester.csproj
@@ -56,6 +56,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CecSharpClient.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -64,9 +65,7 @@
       <Name>LibCecSharp</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/support/create-installer.bat b/support/create-installer.bat
index e0a28a0..8ddc94f 100644
--- a/support/create-installer.bat
+++ b/support/create-installer.bat
@@ -16,7 +16,7 @@ IF "%VS110COMNTOOLS%"=="" (
   set COMPILER11="%VS110COMNTOOLS%\..\IDE\VCExpress.exe"
 ) ELSE IF EXIST "%VS110COMNTOOLS%\..\IDE\devenv.exe" (
   set COMPILER11="%VS110COMNTOOLS%\..\IDE\devenv.exe"
-) ELSE GOTO NOSDK10
+) ELSE GOTO NOSDK11
 
 del /s /f /q ..\build
 mkdir ..\build
@@ -80,6 +80,10 @@ CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-tray.exe
 
 :CREATEINSTALLER
 echo. Creating the installer
+cd ..\build\x64
+cp libcec.dll libcec.x64.dll
+cp cec-client.exe cec-client.x64.exe
+cd ..\..\project
 %NSIS% /V1 /X"SetCompressor /FINAL lzma" "libCEC.nsi"
 
 IF NOT EXIST "..\build\libCEC-installer.exe" GOTO :ERRORCREATINGINSTALLER
@@ -100,8 +104,8 @@ IF "%1%"=="" (
 set EXITCODE=0
 GOTO EXIT
 
-:NOSDK10
-echo. Both Visual Studio 2010 and Visual C++ Express 2010 were not found on your system.
+:NOSDK11
+echo. Visual Studio 2012 was not found on your system.
 GOTO EXIT
 
 :NOSIS
@@ -123,6 +127,7 @@ del /q /f ..\build\*.dll
 del /q /f ..\build\*.lib
 del /q /f ..\build\*.exp
 del /q /f ..\build\*.xml
+del /q /f ..\build\*.metagen
 del /s /f /q ..\build\x64
 rmdir ..\build\x64
 cd ..\support
-- 
2.34.1