Fix Windows build problems

Signed-off-by: Keith W. Campbell <[email protected]>
jonoommen · May 24, 2019 · 87afc37 · 87afc37
1 parent 577e37f
commit 87afc37
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/ddr/lib/ddr-scanner/pdb/PdbScanner.cpp b/ddr/lib/ddr-scanner/pdb/PdbScanner.cpp
@@ -126,7 +126,7 @@ PdbScanner::startScan(OMRPortLibrary *portLibrary, Symbol_IR *ir, vector<string>
 	}
 
 	if (DDR_RC_OK == rc) {
-		rc = loadBlacklist(blacklistPath);
+		rc = loadBlacklist(portLibrary, blacklistPath);
 	}
 
 	if (DDR_RC_OK == rc) {

diff --git a/ddr/tools/blob_reader/CMakeLists.txt b/ddr/tools/blob_reader/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017, 2017 IBM Corp. and others
+# Copyright (c) 2017, 2019 IBM Corp. and others
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License 2.0 which accompanies this
@@ -32,4 +32,9 @@ target_link_libraries(omr_blob_reader
 	omr_ddr_macros
 	omr_ddr_scanner
 	omrutil
+	${OMR_PORT_LIB}
 )
+
+if(OMRPORT_OMRSIG_SUPPORT)
+	target_link_libraries(omr_blob_reader omrsig)
+endif()
diff --git a/ddr/tools/blob_reader/Makefile b/ddr/tools/blob_reader/Makefile
@@ -42,6 +42,10 @@ OBJECTS = \
 
 MODULE_STATIC_LIBS += omrstatic
 
+ifeq (win,$(OMR_HOST_OS))
+  MODULE_SHARED_LIBS += ws2_32 shell32 Iphlpapi psapi pdh
+endif
+
 ifeq (1,$(OMRPORT_OMRSIG_SUPPORT))
   MODULE_SHARED_LIBS += omrsig
 endif