Skip to content

Commit e1692a1

Browse files
ffissoreffissore
committed
Windows: default jdk is 1.8
1 parent 351df31 commit e1692a1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎patches/java_includes.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
77
<ClCompile>
88
<Optimization>Disabled</Optimization>
99
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
10-
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
10+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
1111
<PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
1212
<MinimalRebuild>true</MinimalRebuild>
1313
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -16,7 +16,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
1616
<ClCompile>
1717
<Optimization>Disabled</Optimization>
1818
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
19-
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
19+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
2020
<PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
2121
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
2222
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -25,7 +25,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
2525
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
2626
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
2727
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
28-
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
28+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
2929
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
3030
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
3131
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -34,7 +34,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
3434
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
3535
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
3636
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
37-
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
37+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
3838
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
3939
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
4040
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -43,7 +43,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
4343
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
4444
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
4545
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
46-
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
46+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
4747
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
4848
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
4949
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -52,7 +52,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
5252
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
5353
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
5454
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
55-
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
55+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
5656
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
5757
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
5858
<RuntimeTypeInfo>false</RuntimeTypeInfo>

0 commit comments

Comments
 (0)