Skip to content

Commit a99260b

Browse files
jimmytweijimmytwei
authored
Modified oneTBB and oneDPL Windows samples to use setvars.bat (#1987)
1 parent 1b04e6f commit a99260b

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
<Link>
8181
<SubSystem>Console</SubSystem>
8282
<GenerateDebugInformation>true</GenerateDebugInformation>
83-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
83+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
8484
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
8585
</Link>
8686
<PostBuildEvent>
87-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
87+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
8888
</PostBuildEvent>
8989
<PostBuildEvent>
9090
<Message>copy tbb12_debug.dll to binary folder </Message>
@@ -108,10 +108,10 @@
108108
<EnableCOMDATFolding>true</EnableCOMDATFolding>
109109
<OptimizeReferences>true</OptimizeReferences>
110110
<GenerateDebugInformation>true</GenerateDebugInformation>
111-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
111+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
112112
</Link>
113113
<PostBuildEvent>
114-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
114+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
115115
</PostBuildEvent>
116116
<PostBuildEvent>
117117
<Message>copy tbb12.dll to binary folder </Message>

‎Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
<SubSystem>Console</SubSystem>
6767
<GenerateDebugInformation>true</GenerateDebugInformation>
6868
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
69-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
69+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
7070
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
7171
</Link>
7272
<PostBuildEvent>
73-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
73+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
7474
</PostBuildEvent>
7575
</ItemDefinitionGroup>
7676
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -94,10 +94,10 @@
9494
<OptimizeReferences>true</OptimizeReferences>
9595
<GenerateDebugInformation>true</GenerateDebugInformation>
9696
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
97-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
97+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
9898
</Link>
9999
<PostBuildEvent>
100-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
100+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
101101
</PostBuildEvent>
102102
</ItemDefinitionGroup>
103103
<ItemGroup>

‎Libraries/oneTBB/tbb-resumable-tasks-sycl/tbb-resumable-tasks-sycl.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
<SubSystem>Console</SubSystem>
6666
<GenerateDebugInformation>true</GenerateDebugInformation>
6767
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
68-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
68+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
6969
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
7070
</Link>
7171
<PostBuildEvent>
72-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
72+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
7373
</PostBuildEvent>
7474
</ItemDefinitionGroup>
7575
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -92,10 +92,10 @@
9292
<OptimizeReferences>true</OptimizeReferences>
9393
<GenerateDebugInformation>true</GenerateDebugInformation>
9494
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
95-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
95+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
9696
</Link>
9797
<PostBuildEvent>
98-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
98+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
9999
</PostBuildEvent>
100100
</ItemDefinitionGroup>
101101
<ItemGroup>

‎Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
<SubSystem>Console</SubSystem>
6767
<GenerateDebugInformation>true</GenerateDebugInformation>
6868
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
69-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
69+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
7070
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
7171
</Link>
7272
<PostBuildEvent>
73-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
73+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
7474
</PostBuildEvent>
7575
</ItemDefinitionGroup>
7676
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -94,10 +94,10 @@
9494
<OptimizeReferences>true</OptimizeReferences>
9595
<GenerateDebugInformation>true</GenerateDebugInformation>
9696
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
97-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
97+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions)</AdditionalOptions>
9898
</Link>
9999
<PostBuildEvent>
100-
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
100+
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
101101
</PostBuildEvent>
102102
</ItemDefinitionGroup>
103103
<ItemGroup>

0 commit comments

Comments
 (0)