cec: only target .net 2.0, include all the new stuff in the installer

[deb_libcec.git] / project / LibCecSharp.vcproj

diff --git a/project/LibCecSharp.Net2.vcproj b/project/LibCecSharp.vcproj
similarity index 88%
rename from project/LibCecSharp.Net2.vcproj
rename to project/LibCecSharp.vcproj
index e65be244f75a01e96b68522c75b758908e8d7701..3bd367ba3c8367c28a29dfb687349e9a97265af6 100644 (file)
--- a/project/LibCecSharp.Net2.vcproj
+++ b/project/LibCecSharp.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
-       Name="LibCecSharp.Net2"
+       Name="LibCecSharp"
        ProjectGUID="{E54D4581-CD59-4687-BB10-694B8192EABA}"
-       RootNamespace="LibCecSharpNet2"
+       RootNamespace="LibCecSharp"
        Keyword="ManagedCProj"
        AssemblyReferenceSearchPaths="&quot;$(SolutionDir)..&quot;"
        TargetFrameworkVersion="131072"
@@ -22,7 +22,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir).."
+                       OutputDirectory="$(SolutionDir)..\build\"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
@@ -42,12 +42,13 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)..\include&quot;;&quot;$(SolutionDir)..\src\lib\platform\windows&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -65,12 +66,12 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)..\libcec.lib $(NOINHERIT)"
+                               AdditionalDependencies="$(OutDir)libcec.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                TargetMachine="1"
-                               KeyFile="$(SolutionDir)LibCecSharp.Net2-dev.snk"
+                               KeyFile="$(SolutionDir)LibCecSharp-dev.snk"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -96,7 +97,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir).."
+                       OutputDirectory="$(SolutionDir)..\build\"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
@@ -140,13 +141,13 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)..\libcec.x64.lib $(NOINHERIT)"
+                               AdditionalDependencies="$(OutDir)libcec.x64.lib"
                                OutputFile="$(OutDir)\$(ProjectName).x64.dll"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                TargetMachine="17"
-                               KeyFile="$(SolutionDir)LibCecSharp.Net2-dev.snk"
+                               KeyFile="$(SolutionDir)LibCecSharp-dev.snk"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -172,7 +173,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir).."
+                       OutputDirectory="$(SolutionDir)..\build\"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
@@ -193,11 +194,12 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)..\include&quot;;&quot;$(SolutionDir)..\src\lib\platform\windows&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -215,11 +217,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)..\libcec.lib $(NoInherit)"
+                               AdditionalDependencies="$(OutDir)libcec.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                TargetMachine="1"
-                               KeyFile="$(SolutionDir)LibCecSharp.Net2-dev.snk"
+                               KeyFile="$(SolutionDir)LibCecSharp-dev.snk"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -245,7 +247,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(SolutionDir).."
+                       OutputDirectory="$(SolutionDir)..\build\"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
@@ -289,12 +291,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)..\libcec.x64.lib $(NoInherit)"
-                               OutputFile="$(OutDir)\$(ProjectName).x64.dll"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               TargetMachine="17"
-                               KeyFile="$(SolutionDir)LibCecSharp.Net2-dev.snk"
+                               AdditionalDependencies="$(OutDir)libcec.x64.lib"
+                               KeyFile="$(SolutionDir)LibCecSharp-dev.snk"
                        />
                        <Tool
                                Name="VCALinkTool"