Skip to content

Commit 1b48e41

Browse files
jimmytweijimmytwei
authored
2024.0 windows fixes (#2076)
* Updated Windows samples that contain VS project files to support 2024.0 * Renamed matrix_mul_dpcpp.vcxproj to matrix_mul_sycl.vcxproj * Updated AdditionalIncludeDirectories in VS project files to support both oneapi-vars and setvars.bat
1 parent a8ec885 commit 1b48e41

File tree

23 files changed

+46
-46
lines changed

23 files changed

+46
-46
lines changed

‎DirectProgramming/C++SYCL/CombinationalLogic/mandelbrot/mandelbrot.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<ConformanceMode>true</ConformanceMode>
7171
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
7272
<SYCLWarningLevel>Level3</SYCLWarningLevel>
73-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
73+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
7474
</ClCompile>
7575
<Link>
7676
<SubSystem>Console</SubSystem>
@@ -88,7 +88,7 @@
8888
<ConformanceMode>true</ConformanceMode>
8989
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
9090
<SYCLWarningLevel>Level3</SYCLWarningLevel>
91-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
91+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
9292
</ClCompile>
9393
<Link>
9494
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/CombinationalLogic/sepia-filter/sepia-filter.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<ConformanceMode>true</ConformanceMode>
5959
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
6060
<SYCLWarningLevel>DisableAllWarnings</SYCLWarningLevel>
61-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
61+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
6262
</ClCompile>
6363
<Link>
6464
<SubSystem>Console</SubSystem>
@@ -77,7 +77,7 @@
7777
<ConformanceMode>true</ConformanceMode>
7878
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
7979
<SYCLWarningLevel>DisableAllWarnings</SYCLWarningLevel>
80-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\dev-utilities\latest\include</AdditionalIncludeDirectories>
80+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
8181
</ClCompile>
8282
<Link>
8383
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/DenseLinearAlgebra/complex_mult/complex_mult.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<SDLCheck>true</SDLCheck>
7070
<ConformanceMode>true</ConformanceMode>
7171
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
72-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
72+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
7373
</ClCompile>
7474
<Link>
7575
<SubSystem>Console</SubSystem>
@@ -87,7 +87,7 @@
8787
<SDLCheck>true</SDLCheck>
8888
<ConformanceMode>true</ConformanceMode>
8989
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
90-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
90+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
9191
</ClCompile>
9292
<Link>
9393
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<ConformanceMode>true</ConformanceMode>
108108
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
109109
<SYCLWarningLevel>DisableAllWarnings</SYCLWarningLevel>
110-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
110+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
111111
</ClCompile>
112112
<Link>
113113
<SubSystem>Console</SubSystem>
@@ -144,7 +144,7 @@
144144
<ConformanceMode>true</ConformanceMode>
145145
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
146146
<SYCLWarningLevel>DisableAllWarnings</SYCLWarningLevel>
147-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
147+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
148148
</ClCompile>
149149
<Link>
150150
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/GraphAlgorithms/all-pairs-shortest-paths/all-pairs-shortest-paths.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<PrecompiledHeaderFile>
5656
</PrecompiledHeaderFile>
5757
<SYCLWarningLevel>Level3</SYCLWarningLevel>
58-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
5959
</ClCompile>
6060
<Link>
6161
<SubSystem>Console</SubSystem>
@@ -69,7 +69,7 @@
6969
<PrecompiledHeaderFile>
7070
</PrecompiledHeaderFile>
7171
<SYCLWarningLevel>Level3</SYCLWarningLevel>
72-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
7373
</ClCompile>
7474
<Link>
7575
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/bitonic-sort.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</PrecompiledHeader>
5959
<PrecompiledHeaderFile>
6060
</PrecompiledHeaderFile>
61-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
61+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
6262
</ClCompile>
6363
<Link>
6464
<SubSystem>Console</SubSystem>
@@ -71,7 +71,7 @@
7171
</PrecompiledHeader>
7272
<PrecompiledHeaderFile>
7373
</PrecompiledHeaderFile>
74-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
7575
</ClCompile>
7676
<Link>
7777
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/hidden-markov-models.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</PrecompiledHeader>
9797
<PrecompiledHeaderFile>
9898
</PrecompiledHeaderFile>
99-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
99+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
100100
<SYCLOptimization>Disabled</SYCLOptimization>
101101
<SYCLWarningLevel>Level3</SYCLWarningLevel>
102102
</ClCompile>
@@ -126,7 +126,7 @@
126126
</PrecompiledHeader>
127127
<PrecompiledHeaderFile>
128128
</PrecompiledHeaderFile>
129-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
130130
<SYCLOptimization>Disabled</SYCLOptimization>
131131
<SYCLWarningLevel>Level3</SYCLWarningLevel>
132132
</ClCompile>

‎DirectProgramming/C++SYCL/MapReduce/MonteCarloPi/MonteCarloPi.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ImportGroup>
4141
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4242
<ClCompile>
43-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
43+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
4444
<Optimization>Disabled</Optimization>
4545
<SuppressStartupBanner>false</SuppressStartupBanner>
4646
</ClCompile>
@@ -50,7 +50,7 @@
5050
</ItemDefinitionGroup>
5151
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5252
<ClCompile>
53-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
53+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
5454
<SYCLOptimization>MaxSpeed</SYCLOptimization>
5555
<SuppressStartupBanner>false</SuppressStartupBanner>
5656
</ClCompile>

‎DirectProgramming/C++SYCL/N-BodyMethods/Nbody/Nbody.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<ConformanceMode>true</ConformanceMode>
7575
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
7676
<SYCLWarningLevel>DisableAllWarnings</SYCLWarningLevel>
77-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
77+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
7878
</ClCompile>
7979
<Link>
8080
<SubSystem>Console</SubSystem>
@@ -93,7 +93,7 @@
9393
<ConformanceMode>true</ConformanceMode>
9494
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
9595
<SYCLWarningLevel>DisableAllWarnings</SYCLWarningLevel>
96-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
96+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
9797
</ClCompile>
9898
<Link>
9999
<SubSystem>Console</SubSystem>

‎DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/PrefixSum.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</PrecompiledHeader>
5252
<PrecompiledHeaderFile>
5353
</PrecompiledHeaderFile>
54-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
54+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
5555
</ClCompile>
5656
<Link>
5757
<SubSystem>Console</SubSystem>
@@ -64,7 +64,7 @@
6464
</PrecompiledHeader>
6565
<PrecompiledHeaderFile>
6666
</PrecompiledHeaderFile>
67-
<AdditionalIncludeDirectories>%ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67+
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\</AdditionalIncludeDirectories>
6868
</ClCompile>
6969
<Link>
7070
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)