windows: fix resource files and backwards compat dll names

diff --git a/project/LibCecSharp.rc b/project/LibCecSharp.rc
new file mode 100644 (file)
index 0000000..7c69374
Binary files /dev/null and b/project/LibCecSharp.rc differ

diff --git a/project/LibCecSharp.vcxproj b/project/LibCecSharp.vcxproj
index 5170df89e6504dfd39069f8cc30fb9ff129e5e23..96ffaed3e3730c0f4d905a1da84138f00be25296 100644 (file)
--- 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 8b005712cab8fe913e24810831a0e0a7dd05d708..b66970697c621a85477b5c259c6bf44eca0f2ccc 100644 (file)
--- 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 ee5a12e02a3e76a9b08ba0f1ebecd6291e4f1277..36ade3b420eeb452b80dcb91398bd3335df57346 100644 (file)
--- 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 (file)
Binary files a/project/libcec.rc and b/project/libcec.rc differ

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index 9d2bb9a913114896642d41abe51d32adf758303a..b2af3eaf02db00a4eabeff950dc52269be73d2c9 100644 (file)
--- 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 f966a2be058d71bc8feaf2b96fe53f7c774f0e6c..1b1cb3729ffb43a5365fc55ea803a618a0d7fa6a 100644 (file)
--- 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 (file)
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 (file)
Binary files a/project/testclient.rc and b/project/testclient.rc differ

diff --git a/project/testclient.vcxproj b/project/testclient.vcxproj
index 4ca804f892921a88af17089ccdcdf23bcba91630..2a143ad905a934d0c1d5ede1c4d92430b318362d 100644 (file)
--- 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 0fd21fb85474a02309eeccc6f3f852b19d581ad8..d1cdfdafb77c975c021f251473b2ef049d67c922 100644 (file)
--- 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 a02548ffd5960f0ed327bcbc15c9ef186bbb7345..9ac4261d6376ba872c417c49d839dbd57c08ab3a 100644 (file)
--- 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 e0a28a05f75d330e547bb8877f3f5cb716bb8a85..8ddc94f9644b6873940574d73eb764da92759ab2 100644 (file)
--- 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