Ensure the rc tool works

Author: alexcrichton

gcc-test/src/NMakefile

@@ -2,6 +2,7 @@ all: $(OUT_DIR)/msvc.lib $(OUT_DIR)/msvc.exe
 
 $(OUT_DIR)/msvc.lib: $(OUT_DIR)/msvc.o
 	lib -nologo -out:$(OUT_DIR)/msvc.lib $(OUT_DIR)/msvc.o
+	rc -h
 
 $(OUT_DIR)/msvc.o: src/msvc.c
 	$(CC) -nologo -c -Fo:$@ src/msvc.c -MD

src/windows_registry.rs

@@ -137,18 +137,12 @@ pub fn find_tool(target: &str, tool: &str) -> Option<Tool> {
         let ucrt_lib = ucrt.join("Lib").join(&ucrt_version);
         tool.libs.push(ucrt_lib.join("ucrt").join(sub));
 
+        tool.path.push(ucrt.join("bin").join(sub));
+
         if let Some(dir) = get_sdk10_dir() {
             tool.libs.push(dir.join("um").join(sub));
-            tool.path.push(dir.join("bin").join(sub));
-            tool.include.push(dir.join("include/shared"));
-            tool.include.push(dir.join("include/um"));
-            tool.include.push(dir.join("include/winrt"));
         } else if let Some(dir) = get_sdk81_dir() {
             tool.libs.push(dir.join("um").join(sub));
-            tool.path.push(dir.join("bin").join(sub));
-            tool.include.push(dir.join("include/shared"));
-            tool.include.push(dir.join("include/um"));
-            tool.include.push(dir.join("include/winrt"));
         } else {
             return None
         }