diff options
Diffstat (limited to 'progs/tools/trace')
| -rw-r--r-- | progs/tools/trace/Makefile | 4 | ||||
| -rw-r--r-- | progs/tools/trace/gltrace_support.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/progs/tools/trace/Makefile b/progs/tools/trace/Makefile index 3f7bdcbc93..822e466ad1 100644 --- a/progs/tools/trace/Makefile +++ b/progs/tools/trace/Makefile @@ -16,8 +16,8 @@ TRACER = gltrace.so default: $(TRACER) $(TRACER): $(OBJECTS) - $(TOP)/bin/mklib -o $(TRACER) -noprefix -cplusplus \ - $(MKLIB_OPTIONS) $(OBJECTS) + $(MKLIB) -o $(TRACER) -noprefix -cplusplus -linker '$(CXX)' \ + -ldflags '$(LDFLAGS)' $(MKLIB_OPTIONS) $(OBJECTS) gltrace.cc: gltrace.py PYTHONPATH=$(TOP)/src/mesa/glapi python gltrace.py -f $(TOP)/src/mesa/glapi/gl_API.xml > gltrace.cc diff --git a/progs/tools/trace/gltrace_support.cc b/progs/tools/trace/gltrace_support.cc index b188e73f29..0b76d3247d 100644 --- a/progs/tools/trace/gltrace_support.cc +++ b/progs/tools/trace/gltrace_support.cc @@ -20,6 +20,8 @@ */ #include "gltrace_support.h" +#include <cstdlib> +#include <cstring> #include <assert.h> #include <sstream> #include <fstream> @@ -136,7 +138,7 @@ namespace gltrace { struct timeval now; struct tm t; - static char *months[12] = + static char const *months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" |