From 0a6c4bf842e60b91f5af04526c1db5fcef8aad31 Mon Sep 17 00:00:00 2001 From: "glasere@purdue.edu" <42726565+ethanglaser@users.noreply.github.com> Date: Tue, 22 Nov 2022 09:48:58 -0500 Subject: [PATCH] removal of unnecessary windows examples linking (#2155) --- examples/daal/cpp/makefile_win | 7 +++++-- examples/daal/cpp_sycl/makefile_win | 7 +++++-- examples/oneapi/cpp/makefile_win | 4 ++++ examples/oneapi/dpc/makefile_win | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/examples/daal/cpp/makefile_win b/examples/daal/cpp/makefile_win index 3d8c0052a23..c49a2bdfb57 100755 --- 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 index 84b5f4c88c2..22b80c99d13 100755 --- 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 index 8d379590075..a7a9cf43641 100644 --- 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 index cc62cdabe1e..6001e125666 100644 --- 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: