From 439fc9dd9195401839c3a7c6ddf2f084cdd566bd Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Fri, 4 May 2012 23:36:14 -0500 Subject: [PATCH] GLXEW_EXPORT an WGLEW_EXPORT replaced with WGLEW_FUN_EXPORT, WGLEW_VAR_EXPORT --- auto/Makefile | 8 ++++---- auto/src/glxew_mid.h | 6 ++++-- auto/src/wglew_mid.h | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/auto/Makefile b/auto/Makefile index 1a54d4a..41960cf 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -135,8 +135,8 @@ $(I.DEST)/wglew.h: $(EXT)/.dummy $(BIN)/make_header.pl WINAPI WGL $(WGL_EXT_SPEC) >> $@ cat $(SRC)/wglew_mid.h >> $@ echo -e "\n#ifdef GLEW_MX\nstruct WGLEWContextStruct\n{\n#endif /* GLEW_MX */" >> $@ - $(BIN)/make_struct_fun.pl GLEW_FUN_EXPORT $(WGL_EXT_SPEC) >> $@ - $(BIN)/make_struct_var.pl GLEW_VAR_EXPORT $(WGL_EXT_SPEC) >> $@ + $(BIN)/make_struct_fun.pl WGLEW_FUN_EXPORT $(WGL_EXT_SPEC) >> $@ + $(BIN)/make_struct_var.pl WGLEW_VAR_EXPORT $(WGL_EXT_SPEC) >> $@ echo -e "\n#ifdef GLEW_MX\n}; /* WGLEWContextStruct */\n#endif /* GLEW_MX */\n" >> $@ cat $(SRC)/wglew_tail.h >> $@ @@ -151,9 +151,9 @@ $(I.DEST)/glxew.h: $(EXT)/.dummy $(BIN)/make_header.pl '' GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_header.pl '' GLX $(GLX_EXT_SPEC) >> $@ cat $(SRC)/glxew_mid.h >> $@ - $(BIN)/make_struct_fun.pl GLEW_FUN_EXPORT $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ + $(BIN)/make_struct_fun.pl GLXEW_FUN_EXPORT $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ echo -e "\n#if defined(GLEW_MX)\nstruct GLXEWContextStruct\n{\n#endif /* GLEW_MX */\n" >> $@ - $(BIN)/make_struct_var.pl GLEW_VAR_EXPORT $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ + $(BIN)/make_struct_var.pl GLXEW_VAR_EXPORT $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ echo -e "\n#ifdef GLEW_MX\n}; /* GLXEWContextStruct */\n#endif /* GLEW_MX */\n" >> $@ perl -e 's/GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_2;/GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_0;\nGLXEW_EXPORT GLboolean __GLXEW_VERSION_1_1;\nGLXEW_EXPORT GLboolean __GLXEW_VERSION_1_2;/' -pi $@ cat $(SRC)/glxew_tail.h >> $@ diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h index 040fc3d..cfcd20d 100644 --- a/auto/src/glxew_mid.h +++ b/auto/src/glxew_mid.h @@ -1,7 +1,9 @@ /* ------------------------------------------------------------------------- */ #ifdef GLEW_MX -#define GLXEW_EXPORT +#define GLXEW_FUN_EXPORT +#define GLXEW_VAR_EXPORT #else -#define GLXEW_EXPORT extern +#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT +#define GLXEW_VAR_EXPORT GLEW_VAR_EXPORT #endif /* GLEW_MX */ diff --git a/auto/src/wglew_mid.h b/auto/src/wglew_mid.h index 25c884e..a0a5ade 100644 --- a/auto/src/wglew_mid.h +++ b/auto/src/wglew_mid.h @@ -1,7 +1,9 @@ /* ------------------------------------------------------------------------- */ #ifdef GLEW_MX -#define WGLEW_EXPORT +#define WGLEW_FUN_EXPORT +#define WGLEW_VAR_EXPORT #else -#define WGLEW_EXPORT GLEWAPI +#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT +#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT #endif /* GLEW_MX */