7 files changed, 31 insertions, 27 deletions
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 5f8071f58..b2a74f322 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -205,7 +205,7 @@ buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target,
  * 
  * Default callback for the \c dd_function_table::NewBufferObject() hook.
  */
-static struct gl_buffer_object *
+struct gl_buffer_object *
 _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
 {
    struct gl_buffer_object *obj;
@@ -223,7 +223,7 @@ _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
  * 
  * Default callback for the \c dd_function_table::DeleteBuffer() hook.
  */
-static void
+void
 _mesa_delete_buffer_object(struct gl_context *ctx,
                            struct gl_buffer_object *bufObj)
 {
@@ -344,7 +344,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * \return GL_TRUE for success, GL_FALSE for failure
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
-static GLboolean
+GLboolean
 _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
 		   const GLvoid * data, GLenum usage,
 		   struct gl_buffer_object * bufObj )
@@ -388,7 +388,7 @@ _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
  *
  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
  */
-static void
+void
 _mesa_buffer_subdata( struct gl_context *ctx, GLintptrARB offset,
 		      GLsizeiptrARB size, const GLvoid * data,
 		      struct gl_buffer_object * bufObj )
@@ -421,7 +421,7 @@ _mesa_buffer_subdata( struct gl_context *ctx, GLintptrARB offset,
  *
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
  */
-static void
+void
 _mesa_buffer_get_subdata( struct gl_context *ctx, GLintptrARB offset,
 			  GLsizeiptrARB size, GLvoid * data,
 			  struct gl_buffer_object * bufObj )
@@ -478,7 +478,7 @@ _mesa_buffer_flush_mapped_range( struct gl_context *ctx,
  *
  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
  */
-static GLboolean
+GLboolean
 _mesa_buffer_unmap( struct gl_context *ctx, struct gl_buffer_object *bufObj )
 {
    (void) ctx;
diff --git a/mesalib/src/mesa/main/dlopen.c b/mesalib/src/mesa/main/dlopen.c
index 57a33292e..62d9023a9 100644
--- a/mesalib/src/mesa/main/dlopen.c
+++ b/mesalib/src/mesa/main/dlopen.c
@@ -51,7 +51,7 @@ _mesa_dlopen(const char *libname, int flags)
 #elif defined(_GNU_SOURCE)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    return LoadLibraryA(libname);
 #else
    return NULL;
@@ -82,7 +82,7 @@ _mesa_dlsym(void *handle, const char *fname)
    u.v = dlsym(handle, fname2);
 #elif defined(_GNU_SOURCE)
    u.v = dlsym(handle, fname);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    u.v = (void *) GetProcAddress(handle, fname);
 #else
    u.v = NULL;
@@ -101,7 +101,7 @@ _mesa_dlclose(void *handle)
    (void) handle;
 #elif defined(_GNU_SOURCE)
    dlclose(handle);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    FreeLibrary(handle);
 #else
    (void) handle;
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index f0a9a7922..bae5dad1e 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -44,7 +44,7 @@
  * \param id - the new object's ID
  * \return pointer to new query_object object or NULL if out of memory.
  */
-static struct gl_query_object *
+struct gl_query_object *
 _mesa_new_query_object(struct gl_context *ctx, GLuint id)
 {
    struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
@@ -63,7 +63,7 @@ _mesa_new_query_object(struct gl_context *ctx, GLuint id)
  * Begin a query.  Software driver fallback.
  * Called via ctx->Driver.BeginQuery().
  */
-static void
+void
 _mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* no-op */
@@ -74,7 +74,7 @@ _mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
  * End a query.  Software driver fallback.
  * Called via ctx->Driver.EndQuery().
  */
-static void
+void
 _mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    q->Ready = GL_TRUE;
@@ -85,7 +85,7 @@ _mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
  * Wait for query to complete.  Software driver fallback.
  * Called via ctx->Driver.WaitQuery().
  */
-static void
+void
 _mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* For software drivers, _mesa_end_query() should have completed the query.
@@ -113,7 +113,7 @@ _mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)
  * Delete a query object.  Called via ctx->Driver.DeleteQuery().
  * Not removed from hash table here.
  */
-static void
+void
 _mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    free(q);
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index 676038430..25307a17c 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -125,7 +125,7 @@ _mesa_wait_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,
 }
 
 
-void
+void GLAPIENTRY
 _mesa_init_sync_object_functions(struct dd_function_table *driver)
 {
    driver->NewSyncObject = _mesa_new_sync_object;
@@ -140,7 +140,7 @@ _mesa_init_sync_object_functions(struct dd_function_table *driver)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_init_sync_dispatch(struct _glapi_table *disp)
 {
    SET_IsSync(disp, _mesa_IsSync);
@@ -156,7 +156,7 @@ _mesa_init_sync_dispatch(struct _glapi_table *disp)
 /**
  * Allocate/init the context state related to sync objects.
  */
-void
+void GLAPIENTRY
 _mesa_init_sync(struct gl_context *ctx)
 {
    (void) ctx;
@@ -166,7 +166,7 @@ _mesa_init_sync(struct gl_context *ctx)
 /**
  * Free the context state related to sync objects.
  */
-void
+void GLAPIENTRY
 _mesa_free_sync_data(struct gl_context *ctx)
 {
    (void) ctx;
@@ -182,7 +182,7 @@ _mesa_validate_sync(struct gl_sync_object *syncObj)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
@@ -191,7 +191,7 @@ _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h
index 50a5d1123..e2e92b0ac 100644
--- a/mesalib/src/mesa/main/syncobj.h
+++ b/mesalib/src/mesa/main/syncobj.h
@@ -41,22 +41,22 @@ struct gl_sync_object;
 
 #if FEATURE_ARB_sync
 
-extern void
+extern void GLAPIENTRY
 _mesa_init_sync_object_functions(struct dd_function_table *driver);
 
-extern void
+extern void GLAPIENTRY
 _mesa_init_sync_dispatch(struct _glapi_table *disp);
 
-extern void
+extern void GLAPIENTRY
 _mesa_init_sync(struct gl_context *);
 
-extern void
+extern void GLAPIENTRY
 _mesa_free_sync_data(struct gl_context *);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);
 
-extern void
+extern void GLAPIENTRY
 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);
 
 extern GLboolean GLAPIENTRY
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index 995e079fd..2b796dac0 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -51,7 +51,11 @@
 
 
 #if defined(_WIN32) || defined(WIN32)
+#ifdef _DEBUG
+#define DXTN_LIBNAME "dxtn_dbg.dll"
+#else
 #define DXTN_LIBNAME "dxtn.dll"
+#endif
 #define RTLD_LAZY 0
 #define RTLD_GLOBAL 0
 #elif defined(__DJGPP__)
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c
index 38ae1ce85..92ae9c659 100644
--- a/mesalib/src/mesa/main/version.c
+++ b/mesalib/src/mesa/main/version.c
@@ -25,7 +25,7 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "version.h"
-#include "git_sha1.h"
+/*#include "git_sha1.h"*/
 
 /**
  * Override the context's GL version if the environment variable