From: <che...@us...> - 2010-12-03 15:54:37
|
Revision: 3995 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3995&view=rev Author: chef_koch Date: 2010-12-03 15:54:31 +0000 (Fri, 03 Dec 2010) Log Message: ----------- removed WiimoteLib source added WiimoteLib binary as reference using new output directory for plugins in install script Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/setup/setup.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/ Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-03 15:22:48 UTC (rev 3994) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj 2010-12-03 15:54:31 UTC (rev 3995) @@ -60,6 +60,7 @@ <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> + <Reference Include="WiimoteLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" /> </ItemGroup> <ItemGroup> <Compile Include="Mouse.cs" /> @@ -83,10 +84,6 @@ <Name>IR Server Plugin Interface</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\WiimoteLib\WiimoteLib.csproj"> - <Project>{37A555DF-7012-4B99-8A47-1C922A361E52}</Project> - <Name>WiimoteLib</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\Resources.resx"> @@ -101,6 +98,7 @@ </ItemGroup> <ItemGroup> <Content Include="Icon.ico" /> + <Content Include="References\WiimoteLib.dll" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. @@ -111,6 +109,7 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent> + <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\" +xcopy /Y "$(ProjectDir)References\*.dll" "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2010-12-03 15:22:48 UTC (rev 3994) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2010-12-03 15:54:31 UTC (rev 3995) @@ -63,8 +63,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wii Remote Receiver", "IR Server Plugins\Wii Remote Receiver\Wii Remote Receiver.csproj", "{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WiimoteLib", "IR Server Plugins\WiimoteLib\WiimoteLib.csproj", "{37A555DF-7012-4B99-8A47-1C922A361E52}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Direct Input Receiver", "IR Server Plugins\Direct Input Receiver\Direct Input Receiver.csproj", "{732CDF64-D047-4D3C-91DA-E2FF27D84179}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ads Tech PTV-335 Receiver", "IR Server Plugins\Ads Tech PTV-335 Receiver\Ads Tech PTV-335 Receiver.csproj", "{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB}" @@ -241,10 +239,6 @@ {A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Debug|x86.Build.0 = Debug|x86 {A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Release|x86.ActiveCfg = Release|x86 {A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Release|x86.Build.0 = Release|x86 - {37A555DF-7012-4B99-8A47-1C922A361E52}.Debug|x86.ActiveCfg = Debug|x86 - {37A555DF-7012-4B99-8A47-1C922A361E52}.Debug|x86.Build.0 = Debug|x86 - {37A555DF-7012-4B99-8A47-1C922A361E52}.Release|x86.ActiveCfg = Release|x86 - {37A555DF-7012-4B99-8A47-1C922A361E52}.Release|x86.Build.0 = Release|x86 {732CDF64-D047-4D3C-91DA-E2FF27D84179}.Debug|x86.ActiveCfg = Debug|x86 {732CDF64-D047-4D3C-91DA-E2FF27D84179}.Debug|x86.Build.0 = Debug|x86 {732CDF64-D047-4D3C-91DA-E2FF27D84179}.Release|x86.ActiveCfg = Release|x86 @@ -414,7 +408,6 @@ {A4023992-CCD6-461E-8E14-219A496734C5} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {5A9954F8-344C-489C-B8DA-8E8927271A02} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {A50080F4-53D1-41CC-9C5F-500AFDDE9E8B} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} - {37A555DF-7012-4B99-8A47-1C922A361E52} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {732CDF64-D047-4D3C-91DA-E2FF27D84179} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} @@ -434,11 +427,11 @@ {BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {E757F80C-23C5-4AD6-B178-16799E337E03} {28923F6E-8A68-4BC8-A507-825B09C3F64E} = {E757F80C-23C5-4AD6-B178-16799E337E03} {28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03} + {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {5C0DF76E-D1AE-4161-B8D1-843925C8AB58} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} - {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} {21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2010-12-03 15:22:48 UTC (rev 3994) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2010-12-03 15:54:31 UTC (rev 3995) @@ -376,44 +376,7 @@ File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*" ${LOG_TEXT} "INFO" "Installing IR Server Plugins..." - SetOutPath "$DIR_INSTALL\Plugins" - - File "..\IR Server Suite\IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${Build_Type}\Ads Tech PTV-335 Receiver.*" - File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Custom HID Receiver\bin\${Build_Type}\Custom HID Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Direct Input Receiver.*" - File "..\IR Server Suite\IR Server Plugins\FireDTV Receiver\bin\${Build_Type}\FireDTV Receiver.*" - File "..\IR Server Suite\IR Server Plugins\FusionRemote Receiver\bin\${Build_Type}\FusionRemote Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*" - File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*" - File "..\IR Server Suite\IR Server Plugins\IgorPlug Receiver\bin\${Build_Type}\IgorPlug Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Imon USB Receivers\bin\${Build_Type}\Imon USB Receivers.*" - File "..\IR Server Suite\IR Server Plugins\IR501 Receiver\bin\${Build_Type}\IR501 Receiver.*" - File "..\IR Server Suite\IR Server Plugins\IR507 Receiver\bin\${Build_Type}\IR507 Receiver.*" - File "..\IR Server Suite\IR Server Plugins\IRMan Receiver\bin\${Build_Type}\IRMan Receiver.*" - File "..\IR Server Suite\IR Server Plugins\IRTrans Transceiver\bin\${Build_Type}\IRTrans Transceiver.*" - File "..\IR Server Suite\IR Server Plugins\Keyboard Input\bin\${Build_Type}\Keyboard Input.*" - File "..\IR Server Suite\IR Server Plugins\LiveDrive Receiver\bin\${Build_Type}\LiveDrive Receiver.*" - File "..\IR Server Suite\IR Server Plugins\MacMini Receiver\bin\${Build_Type}\MacMini Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Microsoft MCE Transceiver\bin\${Build_Type}\Microsoft MCE Transceiver.*" - File "..\IR Server Suite\IR Server Plugins\Pinnacle Serial Receiver\bin\${Build_Type}\Pinnacle Serial Receiver.*" - File "..\IR Server Suite\IR Server Plugins\RC102 Receiver\bin\${Build_Type}\RC102 Receiver.*" - File "..\IR Server Suite\IR Server Plugins\RedEye Blaster\bin\${Build_Type}\RedEye Blaster.*" - File "..\IR Server Suite\IR Server Plugins\Serial IR Blaster\bin\${Build_Type}\Serial IR Blaster.*" - File "..\IR Server Suite\IR Server Plugins\Speech Receiver\bin\${Build_Type}\Speech Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\Technotrend Receiver.*" - File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\ttBdaDrvApi_Dll.dll" - File "..\IR Server Suite\IR Server Plugins\USB-UIRT Transceiver\bin\${Build_Type}\USB-UIRT Transceiver.*" - File "..\IR Server Suite\IR Server Plugins\Wii Remote Receiver\bin\${Build_Type}\Wii Remote Receiver.*" - File "..\IR Server Suite\IR Server Plugins\WiimoteLib\bin\${Build_Type}\WiimoteLib.*" - File "..\IR Server Suite\IR Server Plugins\Windows Message Receiver\bin\${Build_Type}\Windows Message Receiver.*" - File "..\IR Server Suite\IR Server Plugins\WinLirc Transceiver\bin\${Build_Type}\WinLirc Transceiver.*" - File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\X10 Transceiver.*" - File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\Interop.X10.dll" - File "..\IR Server Suite\IR Server Plugins\XBCDRC Receiver\bin\${Build_Type}\XBCDRC Receiver.*" - ; Ira project is not compiling currently - ; File "..\IR Server Suite\IR Server Plugins\Ira Transceiver\bin\${Build_Type}\Ira Transceiver.*" - ; File "..\IR Server Suite\IR Server Plugins\Tira Transceiver\bin\${Build_Type}\Tira Transceiver.*" + File /r "${svn_ROOT_IRSS}\bin\${Build_Type}\Plugins" ; Create App Data Folder for IR Server configuration files CreateDirectory "${COMMON_APPDATA}\IR Server" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |