Make windows build user friendlier.

[apitrace] / glxtrace.py

diff --git a/glxtrace.py b/glxtrace.py
index 78d6146e8dadf91b5e3629f5777f38bac83f297e..dfc24df0dcf57c30cc78e9ce603ce40c356f8b8f 100644 (file)
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -41,10 +41,9 @@ class GlxTracer(GlTracer):
         # The symbols visible in libGL.so can vary, so expose them all
         return True
 
-    def get_function_address(self, function):
-        return '__%s' % (function.name,)
-
     def wrap_ret(self, function, instance):
+        GlTracer.wrap_ret(self, function, instance)
+
         if function.name in ("glXGetProcAddress", "glXGetProcAddressARB"):
             print '    %s = __unwrap_proc_addr(procName, %s);' % (instance, instance)
 
@@ -59,7 +58,11 @@ if __name__ == '__main__':
     print '#endif'
     print '#include <dlfcn.h>'
     print
-    print '#include "trace_write.hpp"'
+    print '#include "trace_writer.hpp"'
+    print
+    print '// To validate our prototypes'
+    print '#define GL_GLEXT_PROTOTYPES'
+    print '#define GLX_GLXEXT_PROTOTYPES'
     print
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'