X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=scripts%2Fextgen.py;h=b3319e5937d401c2b5ed08e5cd645a041e2a03b3;hb=ad3238a5acffa0f200a550c5668c18d931d1c569;hp=b3ed9c8f6d6fa033fc9916cebbf778d98a7f61b6;hpb=e79c72cf90dacaa47d82d65d3e6c4252f055f454;p=libs%2Fgl.git

diff --git a/scripts/extgen.py b/scripts/extgen.py
index b3ed9c8f..b3319e59 100755
--- a/scripts/extgen.py
+++ b/scripts/extgen.py
@@ -500,7 +500,7 @@ if funcs:
 #define GET_PROC_ADDRESS(x) get_proc_address(#x)
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #define GET_PROC_ADDRESS_1_1(x) &::x
 #else
 #define GET_PROC_ADDRESS_1_1(x) GET_PROC_ADDRESS(x)
@@ -518,6 +518,7 @@ for f in funcs:
 out.write("\nExtension::SupportLevel init_%s()\n{\n"%target_ext.name.lower())
 if core_version:
 	out.write("\tif(is_disabled(\"GL_%s\"))\n\t\treturn Extension::UNSUPPORTED;\n"%target_ext.name)
+	out.write("#if !defined(__APPLE__) || defined(GL_VERSION_%d_%d)\n"%tuple(core_version))
 	out.write("\tif(")
 	if backport_ext:
 		out.write("is_supported(\"GL_%s\") || "%backport_ext.name)
@@ -533,7 +534,9 @@ if core_version:
 			out.write("\t\t%s = reinterpret_cast<%s>(GET_PROC_ADDRESS%s(%s));\n"%(f.name, f.typedef, gpa_suffix, f.name))
 	out.write("\t\treturn Extension::CORE;\n")
 	out.write("\t}\n")
+	out.write("#endif\n")
 if source_ext and source_ext!=backport_ext:
+	out.write("#if !defined(__APPLE__) || defined(GL_%s)\n"%target_ext.name)
 	out.write("\tif(is_supported(\"GL_%s\"))\n\t{\n"%(source_ext.name))
 	for f in funcs:
 		if f.sources:
@@ -553,6 +556,7 @@ if source_ext and source_ext!=backport_ext:
 			out.write("\t\t%s = reinterpret_cast<%s>(GET_PROC_ADDRESS(%s));\n"%(f.name, f.typedef, src.name))
 	out.write("\t\treturn Extension::EXTENSION;\n")
 	out.write("\t}\n")
+	out.write("#endif\n")
 out.write("\treturn Extension::UNSUPPORTED;\n")
 out.write("}\n")