Merge branch 'master' into d2d

[apitrace] / cli / cli_diff.cpp

diff --git a/cli/cli_diff.cpp b/cli/cli_diff.cpp
index d9d62576d197d2715441e8c89900b96d73b9c3ce..0bd1b31f4f2c1c968b86a04d9a9470255023e57d 100644 (file)
--- a/cli/cli_diff.cpp
+++ b/cli/cli_diff.cpp
@@ -31,7 +31,7 @@
 #include "cli.hpp"
 #include "os_string.hpp"
 #include "os_process.hpp"
-#include "trace_tools.hpp"
+#include "trace_resource.hpp"
 
 static const char *synopsis = "Identify differences between two traces.";
 
@@ -81,11 +81,7 @@ command(int argc, char *argv[])
     file1 = argv[i];
     file2 = argv[i+1];
 
-#define CLI_DIFF_TRACEDIFF_COMMAND "tracediff.sh"
-
-    os::String command = trace::findFile("scripts/" CLI_DIFF_TRACEDIFF_COMMAND,
-                 APITRACE_SCRIPTS_INSTALL_DIR "/" CLI_DIFF_TRACEDIFF_COMMAND,
-                                       true);
+    os::String command = trace::findScript("tracediff.sh");
 
     char* args[4];