From: ksjoberg Date: Thu, 5 Sep 2013 10:51:48 +0000 (+0200) Subject: Add x64 and x86 configurations allow for (simultaneous) platform support X-Git-Tag: v1.5.0-rc1~170^2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfc32839c92d18e3c22e1b5e12301825ca05dc4e;p=thirdparty%2Frrdtool-1.x.git Add x64 and x86 configurations allow for (simultaneous) platform support --- diff --git a/bindings/dotnet/dnrrd_binding_test.csproj b/bindings/dotnet/dnrrd_binding_test.csproj index cb998e45..f9cfdf35 100644 --- a/bindings/dotnet/dnrrd_binding_test.csproj +++ b/bindings/dotnet/dnrrd_binding_test.csproj @@ -33,24 +33,68 @@ false true - + true + bin\x64\Debug\ + TRACE;DEBUG;X64 full - false - bin\Debug\ - DEBUG;TRACE + x64 + bin\Debug\dnrrd_binding_test.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs prompt - 4 AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true - - pdbonly + + bin\x64\Release\ + TRACE true - bin\Release\ + pdbonly + x64 + bin\Release\dnrrd_binding_test.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + + + true + bin\x86\Debug\ + TRACE;DEBUG;X86 + full + x86 + bin\Debug\dnrrd_binding_test.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true + false + + + bin\x86\Release\ TRACE + true + pdbonly + x86 + bin\Release\dnrrd_binding_test.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs prompt - 4 AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false diff --git a/bindings/dotnet/dnrrdlib.csproj b/bindings/dotnet/dnrrdlib.csproj index e665267f..f361c0b9 100644 --- a/bindings/dotnet/dnrrdlib.csproj +++ b/bindings/dotnet/dnrrdlib.csproj @@ -33,24 +33,65 @@ false true - + true + bin\x86\Debug\ + TRACE;DEBUG;X86 full - false - bin\Debug\ - DEBUG;TRACE + x86 + bin\Debug\dnrrdlib.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs prompt - 4 AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false - - pdbonly + + bin\x86\Release\ + TRACE true - bin\Release\ + pdbonly + x86 + bin\Release\dnrrdlib.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + + + true + bin\x64\Debug\ + TRACE;DEBUG;X64 + full + x64 + bin\Debug\dnrrdlib.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + + + bin\x64\Release\ TRACE + true + pdbonly + x64 + bin\Release\dnrrdlib.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs prompt - 4 AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + false diff --git a/bindings/dotnet/rrdlib.cs b/bindings/dotnet/rrdlib.cs index 71c41d92..f488cc40 100644 --- a/bindings/dotnet/rrdlib.cs +++ b/bindings/dotnet/rrdlib.cs @@ -15,6 +15,10 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; +#if X64 +#error 64-bit platform not yet supported. +#endif + /// /// Contains data structures and methods for working with round robin databases. /// diff --git a/bindings/dotnet/rrdlib.sln b/bindings/dotnet/rrdlib.sln index d7a858d6..d927b6b7 100644 --- a/bindings/dotnet/rrdlib.sln +++ b/bindings/dotnet/rrdlib.sln @@ -7,18 +7,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dnrrd_binding_test", "dnrrd EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Release|Any CPU.Build.0 = Release|Any CPU - {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Release|Any CPU.Build.0 = Release|Any CPU + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Debug|x64.ActiveCfg = Debug|x64 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Debug|x64.Build.0 = Debug|x64 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Debug|x86.ActiveCfg = Debug|x86 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Debug|x86.Build.0 = Debug|x86 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Release|x64.ActiveCfg = Release|x64 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Release|x64.Build.0 = Release|x64 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Release|x86.ActiveCfg = Release|x86 + {0688ED86-0E5F-4469-A7DB-D51024DE99E9}.Release|x86.Build.0 = Release|x86 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Debug|x64.ActiveCfg = Debug|x64 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Debug|x86.ActiveCfg = Debug|x86 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Debug|x86.Build.0 = Debug|x86 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Release|x64.ActiveCfg = Release|x64 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Release|x64.Build.0 = Release|x64 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Release|x86.ActiveCfg = Release|x86 + {2BB82CAE-A379-46D9-B2B5-13DC4DB3209C}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE