Skip to content

Commit

Permalink
5.2.0 Changes applied
Browse files Browse the repository at this point in the history
  • Loading branch information
@javmorcas
javmorcas committed Aug 26, 2016
1 parent 516b364 commit 88ac703
Show file tree
Hide file tree
Showing 741 changed files with 15,441 additions and 55,429 deletions.
265 changes: 0 additions & 265 deletions DDSTypesManaged/DDSTypesManaged-64-VS2005.vcproj
View file

This file was deleted.

8 changes: 4 additions & 4 deletions DDSTypesManaged/DDSTypesManaged-64-VS2008.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ProjectGUID="{02F70308-1E4F-413C-B7B7-FCFECB116D64}"
RootNamespace="DDSTypesManaged"
Keyword="ManagedCProj"
AssemblyReferenceSearchPaths=""$(NDDSHOME)/lib/x64Win64dotnet2.0""
AssemblyReferenceSearchPaths=""$(NDDSHOME)/lib/x64Win64VS2008""
TargetFrameworkVersion="131072"
>
<Platforms>
Expand Down Expand Up @@ -186,7 +186,7 @@
MinFrameworkVersion="131072"
/>
<AssemblyReference
RelativePath="$(NDDSHOME)\lib\x64Win64dotnet2.0\nddsdotnet.dll"
RelativePath="$(NDDSHOME)\lib\x64Win64VS2008\nddsdotnet.dll"
AssemblyName="nddsdotnet, Version=1.0.3.0, PublicKeyToken=f319a9351e41fb68, processorArchitecture=AMD64"
MinFrameworkVersion="131072"
/>
Expand Down Expand Up @@ -247,7 +247,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Regenerating type support plugin from $(InputFileName) $(RTIDDSGEN_PREPROCESSOR)"
CommandLine="&quot;$(NDDSHOME)\scripts\rtiddsgen&quot; -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/$(InputFileName)&#x0D;&#x0A;"
CommandLine="&quot;$(NDDSHOME)\bin\rtiddsgen&quot; -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/$(InputFileName)&#x0D;&#x0A;"
Outputs="../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp"
/>
</FileConfiguration>
Expand All @@ -257,7 +257,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Regenerating type support plugin from $(InputFileName) $(RTIDDSGEN_PREPROCESSOR)"
CommandLine="&quot;$(NDDSHOME)/scripts/rtiddsgen&quot; -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/$(InputFileName)&#x0D;&#x0A;"
CommandLine="&quot;$(NDDSHOME)/bin/rtiddsgen&quot; -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/$(InputFileName)&#x0D;&#x0A;"
Outputs="../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp"
/>
</FileConfiguration>
Expand Down
12 changes: 6 additions & 6 deletions DDSTypesManaged/DDSTypesManaged-64-VS2010.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NDDSHOME)/lib/x64Win64dotnet4.0;$(ReferencePath)</ReferencePath>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NDDSHOME)/lib/x64Win64VS2010;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\bin\x64Win64VS2010\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\bin\x64Win64VS2010\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NDDSHOME)/lib/x64Win64dotnet4.0;$(ReferencePath)</ReferencePath>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NDDSHOME)/lib/x64Win64VS2010;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\bin\x64Win64VS2010\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\bin\x64Win64VS2010\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
Expand Down Expand Up @@ -105,7 +105,7 @@
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="nddsdotnet40, Culture=neutral, PublicKeyToken=f319a9351e41fb68">
<HintPath>$(NDDSHOME)\lib\x64Win64dotnet4.0\nddsdotnet40.dll</HintPath>
<HintPath>$(NDDSHOME)\lib\x64Win64VS2010\nddsdotnet40.dll</HintPath>
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
Expand All @@ -124,16 +124,16 @@
<ItemGroup>
<CustomBuild Include="..\idl\test.idl">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(NDDSHOME)\scripts\rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(NDDSHOME)\bin\rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(NDDSHOME)/scripts/rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(NDDSHOME)/bin/rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
12 changes: 6 additions & 6 deletions DDSTypesManaged/DDSTypesManaged-64-VS2012.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NDDSHOME)/lib/x64Win64dotnet4.5;$(ReferencePath)</ReferencePath>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NDDSHOME)/lib/x64Win64VS2012;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\bin\x64Win64VS2012\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\bin\x64Win64VS2012\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NDDSHOME)/lib/x64Win64dotnet4.5;$(ReferencePath)</ReferencePath>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NDDSHOME)/lib/x64Win64VS2012;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\bin\x64Win64VS2012\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\bin\x64Win64VS2012\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
Expand Down Expand Up @@ -95,7 +95,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="nddsdotnet45">
<HintPath>$(NDDSHOME)\x64Win64dotnet4.5\nddsdotnet45.dll</HintPath>
<HintPath>$(NDDSHOME)\x64Win64VS2012\nddsdotnet45.dll</HintPath>
</Reference>
<Reference Include="System">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
Expand Down Expand Up @@ -124,16 +124,16 @@
<ItemGroup>
<CustomBuild Include="..\idl\test.idl">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(NDDSHOME)\scripts\rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(NDDSHOME)\bin\rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(NDDSHOME)/scripts/rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(NDDSHOME)/bin/rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Loading

0 comments on commit 88ac703

Please sign in to comment.