cli: Merge trace_resource.cpp and trace_tools_trace.cpp in.

[apitrace] / cli / cli_retrace.cpp

diff --git a/cli/cli_retrace.cpp b/cli/cli_retrace.cpp
index a2dbd09986b86ffc5d31ab5318b02849699f8d4e..062f51bdded2456bd6ca33959c421c10c72abecf 100644 (file)
--- a/cli/cli_retrace.cpp
+++ b/cli/cli_retrace.cpp
@@ -35,7 +35,7 @@
 #include "os_process.hpp"
 
 #include "trace_parser.hpp"
-#include "trace_resource.hpp"
+#include "cli_resources.hpp"
 
 #include "cli.hpp"
 #include "cli_retrace.hpp"
@@ -89,7 +89,7 @@ executeRetrace(const std::vector<const char *> & opts,
     }
 
     std::vector<const char *> command;
-    os::String retracePath = trace::findProgram(retraceName);
+    os::String retracePath = findProgram(retraceName);
     if (retracePath.length()) {
         command.push_back(retracePath);
     } else {