ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix static build on Windows.

pull/77/head
Vladimír Vondruš 12 years ago
parent
826f5189c5
commit
3a18b0a952
6 changed files with 48 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/MagnumExternal/OpenGL/GL/flextGL.h
  2. 12
      src/MagnumExternal/OpenGL/GL/flextGL.h.template
  3. 12
      src/MagnumExternal/OpenGL/GLES2/flextGL.h
  4. 12
      src/MagnumExternal/OpenGL/GLES2/flextGL.h.template
  5. 12
      src/MagnumExternal/OpenGL/GLES3/flextGL.h
  6. 12
      src/MagnumExternal/OpenGL/GLES3/flextGL.h.template

12
src/MagnumExternal/OpenGL/GL/flextGL.h vendored
Unescape View File

@ -1,6 +1,10 @@
#ifndef _flextgl_h_
#define _flextgl_h_
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/configure.h"
/* Defensive include guards */
#if defined(__glew_h__) || defined(__GLEW_H__)
@ -36,14 +40,14 @@ void flextGLInit();
/* Function declaration macros */
#ifdef _WIN32
#ifndef MAGNUM_BUILD_STATIC
#ifdef FlextGL_EXPORTS
#define FLEXTGL_EXPORT __declspec(dllexport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define FLEXTGL_EXPORT __declspec(dllimport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#else
#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

12
src/MagnumExternal/OpenGL/GL/flextGL.h.template vendored
Unescape View File

@ -2,6 +2,10 @@
#ifndef _flextgl_h_
#define _flextgl_h_
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/configure.h"
/* Defensive include guards */
#if defined(__glew_h__) || defined(__GLEW_H__)
@ -37,14 +41,14 @@ void flextGLInit();
/* Function declaration macros */
#ifdef _WIN32
#ifndef MAGNUM_BUILD_STATIC
#ifdef FlextGL_EXPORTS
#define FLEXTGL_EXPORT __declspec(dllexport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define FLEXTGL_EXPORT __declspec(dllimport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#else
#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

12
src/MagnumExternal/OpenGL/GLES2/flextGL.h vendored
Unescape View File

@ -1,6 +1,10 @@
#ifndef _flextgl_h_
#define _flextgl_h_
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/configure.h"
/* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_)
@ -26,14 +30,14 @@ void flextGLInit();
/* Function declaration macros */
#ifdef _WIN32
#ifndef MAGNUM_BUILD_STATIC
#ifdef FlextGL_EXPORTS
#define FLEXTGL_EXPORT __declspec(dllexport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define FLEXTGL_EXPORT __declspec(dllimport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#else
#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

12
src/MagnumExternal/OpenGL/GLES2/flextGL.h.template vendored
Unescape View File

@ -2,6 +2,10 @@
#ifndef _flextgl_h_
#define _flextgl_h_
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/configure.h"
/* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_)
@ -27,14 +31,14 @@ void flextGLInit();
/* Function declaration macros */
#ifdef _WIN32
#ifndef MAGNUM_BUILD_STATIC
#ifdef FlextGL_EXPORTS
#define FLEXTGL_EXPORT __declspec(dllexport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define FLEXTGL_EXPORT __declspec(dllimport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#else
#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

12
src/MagnumExternal/OpenGL/GLES3/flextGL.h vendored
Unescape View File

@ -1,6 +1,10 @@
#ifndef _flextgl_h_
#define _flextgl_h_
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/configure.h"
/* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_)
@ -30,14 +34,14 @@ void flextGLInit();
/* Function declaration macros */
#ifdef _WIN32
#ifndef MAGNUM_BUILD_STATIC
#ifdef FlextGL_EXPORTS
#define FLEXTGL_EXPORT __declspec(dllexport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define FLEXTGL_EXPORT __declspec(dllimport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#else
#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

12
src/MagnumExternal/OpenGL/GLES3/flextGL.h.template vendored
Unescape View File

@ -2,6 +2,10 @@
#ifndef _flextgl_h_
#define _flextgl_h_
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/configure.h"
/* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_)
@ -31,14 +35,14 @@ void flextGLInit();
/* Function declaration macros */
#ifdef _WIN32
#ifndef MAGNUM_BUILD_STATIC
#ifdef FlextGL_EXPORTS
#define FLEXTGL_EXPORT __declspec(dllexport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define FLEXTGL_EXPORT __declspec(dllimport)
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#else
#define FLEXTGL_EXPORT __attribute__ ((visibility ("default")))
#define FLEXTGL_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

Write Preview
Loading…
Cancel
Save