Skip to content

Commit d83f9ec

Browse files
author
cammiemw
committed
Updated indri configuration for Visual Studio compiling
git-svn-id: https://svn.code.sf.net/p/lemur/code/indri/trunk@2783 14020d50-3050-45fe-8e0c-5ed7005ca764
1 parent 1a75b36 commit d83f9ec

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

swig/src/csharp/IndriCsharp-VS2012.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<OldToolsVersion>3.5</OldToolsVersion>
2929
<UpgradeBackupLocation>
3030
</UpgradeBackupLocation>
31-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
31+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
3232
<PublishUrl>publish\</PublishUrl>
3333
<Install>true</Install>
3434
<InstallFrom>Disk</InstallFrom>
@@ -44,6 +44,7 @@
4444
<IsWebBootstrapper>false</IsWebBootstrapper>
4545
<UseApplicationTrust>false</UseApplicationTrust>
4646
<BootstrapperEnabled>true</BootstrapperEnabled>
47+
<TargetFrameworkProfile />
4748
</PropertyGroup>
4849
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4950
<OutputPath>bin\Debug\</OutputPath>
@@ -68,6 +69,7 @@
6869
<DebugType>full</DebugType>
6970
<ErrorReport>prompt</ErrorReport>
7071
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
72+
<Prefer32Bit>false</Prefer32Bit>
7173
</PropertyGroup>
7274
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
7375
<OutputPath>bin\Release\</OutputPath>
@@ -92,6 +94,7 @@
9294
<DebugType>none</DebugType>
9395
<ErrorReport>prompt</ErrorReport>
9496
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
97+
<Prefer32Bit>false</Prefer32Bit>
9598
</PropertyGroup>
9699
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
97100
<DebugSymbols>true</DebugSymbols>
@@ -103,6 +106,7 @@
103106
<PlatformTarget>x64</PlatformTarget>
104107
<ErrorReport>prompt</ErrorReport>
105108
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
109+
<Prefer32Bit>false</Prefer32Bit>
106110
</PropertyGroup>
107111
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
108112
<OutputPath>bin\x64\Release\</OutputPath>
@@ -113,6 +117,7 @@
113117
<PlatformTarget>x64</PlatformTarget>
114118
<ErrorReport>prompt</ErrorReport>
115119
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
120+
<Prefer32Bit>false</Prefer32Bit>
116121
</PropertyGroup>
117122
<ItemGroup>
118123
<Reference Include="System">
@@ -262,4 +267,4 @@
262267
<PostBuildEvent>
263268
</PostBuildEvent>
264269
</PropertyGroup>
265-
</Project>
270+
</Project>

swig/swig-VS2012.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100100
<ClCompile>
101101
<Optimization>Disabled</Optimization>
102-
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_92\include\win32;C:\Program Files\Java\jdk1.8.0_92\include;..\include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102+
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_221\include\win32;C:\Program Files\Java\jdk1.8.0_221\include;..\include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
103103
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_EXPORTS;INDRI_STANDALONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104104
<MinimalRebuild>true</MinimalRebuild>
105105
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -129,7 +129,7 @@
129129
</Midl>
130130
<ClCompile>
131131
<Optimization>Disabled</Optimization>
132-
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_92\include\win32;C:\Program Files\Java\jdk1.8.0_92\include;include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_221\include\win32;C:\Program Files\Java\jdk1.8.0_221\include;include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133133
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_EXPORTS;INDRI_STANDALONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134134
<MinimalRebuild>true</MinimalRebuild>
135135
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -158,7 +158,7 @@
158158
<ClCompile>
159159
<Optimization>Full</Optimization>
160160
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
161-
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_92\include\win32;C:\Program Files\Java\jdk1.8.0_92\include;..\include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
161+
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_221\include\win32;C:\Program Files\Java\jdk1.8.0_221\include;..\include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
162162
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_EXPORTS;INDRI_STANDALONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163163
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
164164
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -188,7 +188,7 @@
188188
<ClCompile>
189189
<Optimization>Full</Optimization>
190190
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
191-
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_92\include\win32;C:\Program Files\Java\jdk1.8.0_92\include;..\include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
191+
<AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.8.0_221\include\win32;C:\Program Files\Java\jdk1.8.0_221\include;..\include;..\contrib\lemur\include;..\contrib\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
192192
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_EXPORTS;INDRI_STANDALONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
193193
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
194194
<RuntimeTypeInfo>true</RuntimeTypeInfo>

0 commit comments

Comments
 (0)