From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 23 Sep 2009 20:26:21 +0000 (+0000)
Subject: Use APIENTRY since that seems to work with both Mesa and Nvidia headers
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=8b398bfe13b0884191b1fac56f274d395fd9d4dd;p=gldbg.git

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 b940036..da23cb3 100755
--- 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 9f26de3..fce7d7f 100644
--- 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
 {