Skip to content

Commit 85768a9

Browse files
committed
Double includes.
1 parent 04b5a02 commit 85768a9

9 files changed

Lines changed: 6 additions & 17 deletions

File tree

src/libikvm-tests/libikvm-tests.clangproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<ItemGroup>
99
<ProjectReference Include="..\libjvm\libjvm.clangproj" />
1010
</ItemGroup>
11-
<ItemGroup>
12-
<Compile Include="**\*.c" />
13-
</ItemGroup>
1411
<Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
1512
<Import Project="$(MSBuildThisFileDirectory)..\..\targets\lib.targets" />
1613
</Project>

src/libikvm/libikvm.clangproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<ItemGroup Condition="$(TargetIdentifier.StartsWith('linux-'))">
1313
<Dependencies Include="c" />
1414
</ItemGroup>
15-
<ItemGroup>
16-
<Compile Include="**\*.c" />
17-
<Compile Include="**\*.cpp" />
18-
</ItemGroup>
1915
<Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
2016
<Import Project="$(MSBuildThisFileDirectory)..\..\targets\lib.targets" />
2117
</Project>

src/libjnf/libjnf.clangproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<AdditionalLinkOptions Include="-framework" Value="CoreFoundation" Separator=" " />
1515
<AdditionalLinkOptions Include="-framework" Value="Foundation" Separator=" " />
1616
<AdditionalLinkOptions Include="-framework" Value="AppKit" Separator=" " />
17-
<Header Include="JavaNativeFoundation\*.h" IncludePath="JavaNativeFoundation\%(Filename)%(Extension)" />
18-
<Compile Include="JavaNativeFoundation\*.m" Language="objective-c" />
17+
<Header Update="JavaNativeFoundation\*.h" IncludePath="JavaNativeFoundation\%(Filename)%(Extension)" />
1918
</ItemGroup>
2019
<Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
2120
<Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />

src/libjvm/libjvm.clangproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<AdditionalLinkOptions Include="-Wl,-rpath,@loader_path%2f.." />
6161
</ItemGroup>
6262
<ItemGroup>
63-
<Compile Include="**\*.c" LanguageStandard="c99" />
64-
<Compile Include="**\*.cpp" LanguageStandard="c++11" />
63+
<Compile Update="**\*.c" LanguageStandard="c99" />
64+
<Compile Update="**\*.cpp" LanguageStandard="c++11" />
6565
</ItemGroup>
6666
<ItemGroup>
6767
<Header Include="$(OpenJdkDir)jdk\src\share\javavm\export\**\*.h">

src/libmanagement/libmanagement.clangproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ItemGroup>
1313
<IncludeDirectories Include="$(OpenJdkDir)jdk\src\share\native\sun\management" />
1414
<IncludeDirectories Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\management" />
15-
<Compile Include="*.c" />
1615
</ItemGroup>
1716
<ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
1817
<Dependencies Include="psapi" />

src/libosx/libosx.clangproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<Compile Include="$(OpenJdkDir)jdk\src\macosx\native\com\apple\eio\*.m" />
2424
<Compile Include="$(OpenJdkDir)jdk\src\macosx\native\apple\security\*.m" />
2525
<Compile Include="$(OpenJdkDir)jdk\src\macosx\native\apple\launcher\*.m" />
26-
<Compile Include="**\*.c" />
2726
</ItemGroup>
2827
<Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
2928
<Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />

src/libosxapp/libosxapp.clangproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<IncludeDirectories Include="$(IntermediateOutputPath)\gensrc" />
2929
<Header Include="$(OpenJdkDir)jdk\src\macosx\native\sun\osxapp\*.h" />
3030
<Compile Include="$(OpenJdkDir)jdk\src\macosx\native\sun\osxapp\*.m" Language="objective-c" />
31-
<Compile Include="**\*.c" />
3231
</ItemGroup>
3332

3433
<Target Name="FindJdk">

src/libsunec/libsunec.clangproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PreprocessorDefinitions Include="MP_API_COMPATIBLE;NSS_ECC_MORE_THAN_SUITE_B" />
1414
<Compile Include="$(OpenJdkDir)jdk\src\share\native\sun\security\ec\**\*.cpp" LanguageStandard="c++11" />
1515
<Compile Include="$(OpenJdkDir)jdk\src\share\native\sun\security\ec\**\*.c" LanguageStandard="c99" />
16-
<Compile Include="**\*.c" LanguageStandard="c99" />
16+
<Compile Update="**\*.c" LanguageStandard="c99" />
1717
</ItemGroup>
1818
<ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
1919
<Dependencies Include="shlwapi" />

src/libunpack/libunpack.clangproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<IncludeDirectories Include="$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack" />
1414
<PreprocessorDefinitions Include="NO_ZLIB;UNPACK_JNI;FULL" />
1515
<Compile Include="$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack\**\*.cpp" Exclude="$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack\main.cpp;$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack\jni.cpp" LanguageStandard="c++11" />
16-
<Compile Include="jni.cpp" LanguageStandard="c++11" />
17-
<Compile Include="jni_onload.c" LanguageStandard="c99" />
16+
<Compile Update="jni.cpp" LanguageStandard="c++11" />
17+
<Compile Update="jni_onload.c" LanguageStandard="c99" />
1818
</ItemGroup>
1919
<ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
2020
<PreprocessorDefinitions Include="mkdir" Value="_mkdir" />

0 commit comments

Comments
 (0)