removal of unnecessary windows examples linking (#2155)

oneapi-src · Dec 15, 2022 · 0a6c4bf · 0a6c4bf
1 parent fbe1494
commit 0a6c4bf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/examples/daal/cpp/makefile_win b/examples/daal/cpp/makefile_win
@@ -117,10 +117,13 @@ COPTS=-Wall -w -m64 $(COPTS)
 COPTS=-W3 -EHsc $(COPTS)
 !ENDIF
 
-DAAL_LIB = "$(DAAL_PATH)\onedal_core$(EXT)" "$(DAAL_PATH)\onedal_thread.lib"
+!IF ("$(RES_EXT)"=="lib")
+LOPTS = "$(DAAL_PATH)\onedal_core$(EXT)" "$(DAAL_PATH)\onedal_thread.lib" tbb12.lib tbbmalloc.lib
+!ELSE
+LOPTS = "$(DAAL_PATH)\onedal_core$(EXT)"
+!ENDIF
 
 COPTS = -MD -Isource\utils $(COPTS) $(OUT_OPTS)
-LOPTS = $(DAAL_LIB) tbb12.lib tbbmalloc.lib
 RES_DIR  =_results\$(compiler)_intel64_$(RES_EXT)
 
 lib libintel64:

diff --git a/examples/daal/cpp_sycl/makefile_win b/examples/daal/cpp_sycl/makefile_win
@@ -103,10 +103,13 @@ COPTS=-Wall -w $(COPTS)
 COPTS=-m64 $(COPTS)
 !ENDIF
 
-DAAL_LIB = "$(DAAL_PATH)\onedal_core$(EXT)" "$(DAAL_PATH)\onedal_thread.lib"
+!IF ("$(RES_EXT)"=="lib")
+LOPTS = "$(DAAL_PATH)\onedal_core$(EXT)" "$(DAAL_PATH)\onedal_thread.lib" tbb12.lib tbbmalloc.lib $(RT_LIB)
+!ELSE
+LOPTS = "$(DAAL_PATH)\onedal_core$(EXT)" $(RT_LIB)
+!ENDIF
 
 COPTS = -MD -Isource\utils $(COPTS) $(OUT_OPTS)
-LOPTS = $(DAAL_LIB) tbb12.lib tbbmalloc.lib $(RT_LIB)
 RES_DIR  =_results\$(compiler)_$(_IA)_$(RES_EXT)
 
 lib libintel64:

diff --git a/examples/oneapi/cpp/makefile_win b/examples/oneapi/cpp/makefile_win
@@ -115,7 +115,11 @@ EXT_LIB = tbb12.lib tbbmalloc.lib
 EXT_LIB = /link /DEFAULTLIB:tbb12.lib /DEFAULTLIB:tbbmalloc.lib
 !ENDIF
 
+!IF ("$(RES_EXT)"=="lib")
 DAAL_LIB = "$(DAAL_PATH)\onedal$(EXT)" "$(DAAL_PATH)\onedal_core$(EXT)" "$(DAAL_PATH)\onedal_thread.lib"
+!ELSE
+DAAL_LIB = "$(DAAL_PATH)\onedal$(EXT)" "$(DAAL_PATH)\onedal_core$(EXT)"
+!ENDIF
 
 RES_DIR = _results\$(compiler)_$(_IA)_$(RES_EXT)
 COPTS = -MD /Isource /I"$(DAALROOT)\include" $(COPTS) /Fe$(RES_DIR)\\

diff --git a/examples/oneapi/dpc/makefile_win b/examples/oneapi/dpc/makefile_win
@@ -86,16 +86,16 @@ CLEAN=
 !ENDIF
 
 !IF ("$(RES_EXT)"=="lib")
-DAAL_LIB="$(DAAL_PATH)\onedal_core.lib" "$(DAAL_PATH)\onedal_dpc.lib" "$(DAAL_PATH)\onedal_sycl.lib"
+DAAL_LIB="$(DAAL_PATH)\onedal_core.lib" "$(DAAL_PATH)\onedal_dpc.lib" "$(DAAL_PATH)\onedal_sycl.lib" "$(DAAL_PATH)\onedal_thread.lib"
 RT_LIB=/link /ignore:4078 OpenCL.lib
-
+LOPTS = $(DAAL_LIB) tbb12.lib tbbmalloc.lib $(RT_LIB)
 !ELSE
 DAAL_LIB="$(DAAL_PATH)\onedal_dpc_dll.lib"
 RT_LIB=/link /ignore:4078
+LOPTS = $(DAAL_LIB) $(RT_LIB)
 !ENDIF
 
 COPTS = -MD /Isource /I"$(DAALROOT)\include" $(COPTS) $(OUT_OPTS)
-LOPTS = $(DAAL_LIB) "$(DAAL_PATH)\onedal_thread.lib" tbb12.lib tbbmalloc.lib $(RT_LIB)
 RES_DIR  =_results\$(compiler)_$(_IA)_$(RES_EXT)
 
 lib libintel64: