X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FParasitemiaUI.fsproj;h=2231bf4ca5bf60349cf9ea3343df09915d18c545;hp=3b887917867ef731e974a3fd9b378b87f85d260e;hb=23466ba92c5595f6c0b9f97c86a221a4e5ffebe9;hpb=4bfa3cbdc6145e6944f02e24829ab2ef3a851ac1

diff --git a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
index 3b88791..2231bf4 100644
--- a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
+++ b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
@@ -26,7 +26,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DocumentationFile>bin\Debug\ParasitemiaUI.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
     <StartArguments>--folder "../../../Images/debug" --output "../../../Images/output" --debug</StartArguments>
@@ -38,7 +38,7 @@
     <Tailcalls>false</Tailcalls>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DocumentationFile>bin\Debug\ParasitemiaUI.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
     <StartArguments>--output "../../../Images/output" --debug</StartArguments>
@@ -59,30 +59,23 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '11.0'">
-      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
+    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+  </PropertyGroup>
   <Import Project="$(FSharpTargetsPath)" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
+    <Resource Include="Resources\chuv_logo.png" />
+    <Resource Include="Resources\hes-so_logo.png" />
     <Resource Include="Resources\icon.ico" />
-    <Resource Include="XAML\NumericUpDown.xaml" />
-    <Compile Include="XAML\NumericUpDown.xaml.fs" />
     <Resource Include="XAML\ImageSourcePreview.xaml" />
     <Compile Include="XAML\ImageSourcePreview.xaml.fs" />
     <Resource Include="XAML\ImageSourceSelection.xaml" />
     <Compile Include="XAML\ImageSourceSelection.xaml.fs" />
     <Resource Include="XAML\RBCFrame.xaml" />
     <Compile Include="XAML\RBCFrame.xaml.fs" />
+    <Resource Include="XAML\DPICalculatorWindow.xaml" />
+    <Compile Include="XAML\DPICalculatorWindow.xaml.fs" />
     <Resource Include="XAML\AnalysisWindow.xaml" />
     <Compile Include="XAML\AnalysisWindow.xaml.fs" />
     <Resource Include="XAML\AboutWindow.xaml" />
@@ -90,10 +83,13 @@
     <Resource Include="XAML\MainWindow.xaml" />
     <Compile Include="XAML\MainWindow.xaml.fs" />
     <Compile Include="Types.fs" />
+    <Compile Include="Utils.fs" />
     <Compile Include="PiaZ.fs" />
     <Compile Include="State.fs" />
-    <Compile Include="About.fs" />
+    <Compile Include="Export.fs" />
+    <Compile Include="DPICalculator.fs" />
     <Compile Include="Analysis.fs" />
+    <Compile Include="About.fs" />
     <Compile Include="GUI.fs" />
     <None Include="App.config" />
     <Content Include="packages.config" />