Cleanup.

diff --git a/glapi.py b/glapi.py
index c94358c..874c34b 100644 (file)
--- a/glapi.py
+++ b/glapi.py
@@ -2529,7 +2529,7 @@ GLrenderbuffer = Handle("renderbuffer", GLuint)
 
 
 def GlFunction(*args, **kwargs):
-    kwargs.setdefault('call', 'GLAPIENTRY')
+    kwargs.setdefault('call', 'APIENTRY')
     return Function(*args, **kwargs)
 
 

diff --git a/glsize.hpp b/glsize.hpp
index 99df9dd..3eb78fc 100644 (file)
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -29,6 +29,9 @@
 
 #include <cassert>
 
+#include "glimports.hpp"
+
+
 static inline size_t
 __gl_calllists_size(GLsizei n, GLenum type)
 {

diff --git a/helpers/gl_trace.py b/helpers/gl_trace.py
index 84dae4c..182b395 100755 (executable)
--- a/helpers/gl_trace.py
+++ b/helpers/gl_trace.py
@@ -104,9 +104,10 @@ def show_usage():
     print "Usage: %s [-f input_file_name]" % sys.argv[0]
     sys.exit(1)
 
+
 if __name__ == '__main__':
     file_name = os.path.join(glapi_path, "gl_API.xml")
-    
+
     try:
         (args, trail) = getopt.getopt(sys.argv[1:], "f:")
     except Exception,e:

diff --git a/opengl32.py b/opengl32.py
index 43cbb83..cf1dc2a 100644 (file)
--- a/opengl32.py
+++ b/opengl32.py
@@ -424,11 +424,7 @@ if __name__ == '__main__':
     print
     print '#define _GDI32_'
     print
-    print '#include <windows.h>'
-    print '#include <tchar.h>'
-    print '#include <GL/gl.h>'
-    print '#include "glext.h"'
-    print '#include "wglext.h"'
+    print '#include "glimports.hpp"'
     print
     print '#include "log.hpp"'
     print '#include "glsize.hpp"'

diff --git a/stdapi.py b/stdapi.py
index 8326a72..81a7fe3 100644 (file)
--- a/stdapi.py
+++ b/stdapi.py
@@ -380,7 +380,7 @@ class Function:
 
 
 def StdFunction(*args, **kwargs):
-    kwargs.setdefault('call', 'GLAPIENTRY')
+    kwargs.setdefault('call', '__stdcall')
     return Function(*args, **kwargs)