3 files changed, 7 insertions, 1 deletions
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 3b0a9de5e77..d6bf5d81a3a 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -116,6 +116,9 @@ glapi_libglapi_la_CPPFLAGS = \
 if HAVE_APPLEDRI
 glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
 endif
+if HAVE_WINDOWSDRI
+glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
+endif
 
 if HAVE_SHARED_GLAPI
 glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 0d7c3385d2e..ba5d1442cda 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -32,6 +32,9 @@ MESA_GLAPI_OUTPUTS = \
 if HAVE_APPLEDRI
 MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
 endif
+if HAVE_WINDOWSDRI
+MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
+endif
 
 MESA_GLAPI_ASM_OUTPUTS =
 if HAVE_X86_ASM
diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index 3593c88bbc1..f1ad4c1b5e8 100644
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -158,7 +158,7 @@ _GLAPI_EXPORT const char *
 _glapi_get_proc_name(unsigned int offset);
 
 
-#ifdef GLX_USE_APPLEGL
+#if defined(GLX_USE_APPLEGL) || defined(GLX_USE_WINDOWSGL)
 _GLAPI_EXPORT struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 #endif