4 files changed, 25 insertions, 15 deletions
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c
index d6a568e88..9cd703030 100644
--- a/xorg-server/glx/glapi.c
+++ b/xorg-server/glx/glapi.c
@@ -54,7 +54,11 @@
 
 #include <dix-config.h>
 #include <X11/Xfuncproto.h>
+#ifdef _MSC_VER
+#define PUBLIC _declspec(dllexport)
+#else
 #define PUBLIC _X_EXPORT
+#endif
 
 #else
 
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 8f2cf6621..68e5cd328 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -73,6 +73,11 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
  */
 #define MAX_EXTENSION_FUNCS 300
 
+#ifdef _MSC_VER
+#define EXTERN _declspec(dllexport)
+#else
+#define EXTERN extern
+#endif
 
 /**
  ** Define the GET_CURRENT_CONTEXT() macro.
@@ -90,8 +95,8 @@ extern __thread void * _glapi_tls_Context
 
 #else
 
-extern void *_glapi_Context;
-extern struct _glapi_table *_glapi_Dispatch;
+EXTERN void *_glapi_Context;
+EXTERN struct _glapi_table *_glapi_Dispatch;
 
 # ifdef THREADS
 #  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
@@ -106,29 +111,29 @@ extern struct _glapi_table *_glapi_Dispatch;
  ** GL API public functions
  **/
 
-extern void
+EXTERN void
 _glapi_noop_enable_warnings(GLboolean enable);
 
-extern void
+EXTERN void
 _glapi_set_warning_func(_glapi_warning_func func);
 
-extern void
+EXTERN void
 _glapi_check_multithread(void);
 
 
-extern void
+EXTERN void
 _glapi_set_context(void *context);
 
 
-extern void *
+EXTERN void *
 _glapi_get_context(void);
 
 
-extern void
+EXTERN void
 _glapi_set_dispatch(struct _glapi_table *dispatch);
 
 
-extern struct _glapi_table *
+EXTERN struct _glapi_table *
 _glapi_get_dispatch(void);
 
 
@@ -144,7 +149,7 @@ struct _glapi_table *
 _glapi_get_override_dispatch(int layer);
 
 
-extern GLuint
+EXTERN GLuint
 _glapi_get_dispatch_table_size(void);
 
 
@@ -152,11 +157,11 @@ extern void
 _glapi_check_table(const struct _glapi_table *table);
 
 
-extern int
+EXTERN int
 _glapi_add_dispatch( const char * const * function_names,
 		     const char * parameter_signature );
 
-extern GLint
+EXTERN GLint
 _glapi_get_proc_offset(const char *funcName);
 
 
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index fe2492a0f..1d92d7442 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -85,7 +85,6 @@ Section "VcXsrv (required)"
   File "..\XErrorDB"
   File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
   File "..\..\tools\plink\obj\release\plink.exe"
-  File "..\..\mesalib\windows\VC8\mesa\Release\mesaopengl32.dll"
   File "..\..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll"
   SetOutPath $INSTDIR\fonts
   File /r "..\fonts\*.*"
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 61f94c3a9..c9b9e7e62 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -125,9 +125,11 @@ load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
 
 all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \
      ..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe xclock.exe xcalc.exe \
-     xwininfo.exe mesaopengl32.dll swrast_dri.dll
+     xwininfo.exe swrast_dri.dll
 
-swrast_dri.dll: ..\mesalib\lib\swrast_dri.dll
+
+load_makefile ..\mesalib\windows\VC8\mesa\makefile MAKESERVER=0 DEBUG=0
+swrast_dri.dll: ..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll
 	copy $< $@
 
 mesaopengl32.dll: ..\mesalib\lib\mesaopengl32.dll