Use APIENTRY since that seems to work with both Mesa and Nvidia headers

Remove include for glstate.h, which is not in the repo yet

diff --git a/genwrap.py b/genwrap.py
index b940036e62b10e999a42346479e902a12b8096d9..da23cb331880292920fa98805f32b92e9c90de51 100755 (executable)
--- a/genwrap.py
+++ b/genwrap.py
@@ -205,7 +205,7 @@ out.close()
 
 out = open(os.path.join(outdir, "glwrap.funcs"), "w")
 for f in funcs:
-       out.write("%s GLAPIENTRY gl%s(%s)\n{\n"%(f[1], f[0], ", ".join("%s %s"%(p[1], p[0]) for p in f[2])))
+       out.write("%s APIENTRY gl%s(%s)\n{\n"%(f[1], f[0], ", ".join("%s %s"%(p[1], p[0]) for p in f[2])))
 
        out.write("\tstatic %s (*orig)(%s) = NULL;\n"%(f[1], ", ".join(p[1] for p in f[2])))
        if f[1]!="void":

diff --git a/source/gldbg.h b/source/gldbg.h
index 9f26de3f34e872485c5129c0e827f1b69c85d896..fce7d7fa2fd4790f4fa96439690a8ce34875d945 100644 (file)
--- a/source/gldbg.h
+++ b/source/gldbg.h
@@ -12,7 +12,7 @@ Distributed under the GPL
 #include <vector>
 #include <msp/core/application.h>
 #include <msp/fs/path.h>
-#include "glstate.h"
+#include "gldecoder.h"
 
 class GlDbg: public Msp::Application
 {