diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-19 15:52:51 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-19 15:52:51 +0000 |
| commit | 9ec58c2c5bbf90428a0e8e1c4f4af3805c602cd3 (patch) | |
| tree | 0519440b1cfa2b839ee1995b3e09d62dc05dd9d1 /src/glut/glx | |
| parent | 3dc8cc4ebc63624dd521923271e63c2ac5a8aaae (diff) | |
DOS and glide driver updates from Daniel Borca
Diffstat (limited to 'src/glut/glx')
| -rw-r--r-- | src/glut/glx/glut_bitmap.c | 2 | ||||
| -rw-r--r-- | src/glut/glx/glut_bwidth.c | 4 | ||||
| -rw-r--r-- | src/glut/glx/glut_stroke.c | 2 | ||||
| -rw-r--r-- | src/glut/glx/glut_swidth.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/glut/glx/glut_bitmap.c b/src/glut/glx/glut_bitmap.c index f471167810..8fec7f1171 100644 --- a/src/glut/glx/glut_bitmap.c +++ b/src/glut/glx/glut_bitmap.c @@ -16,7 +16,7 @@ glutBitmapCharacter(GLUTbitmapFont font, int c) GLint swapbytes, lsbfirst, rowlength; GLint skiprows, skippixels, alignment; -#if defined(_WIN32) +#if defined(_WIN32) || defined(GLUT_IMPORT_LIB) fontinfo = (BitmapFontPtr) __glutFont(font); #else fontinfo = (BitmapFontPtr) font; diff --git a/src/glut/glx/glut_bwidth.c b/src/glut/glx/glut_bwidth.c index 34776f8b0f..f9cdb184da 100644 --- a/src/glut/glx/glut_bwidth.c +++ b/src/glut/glx/glut_bwidth.c @@ -15,7 +15,7 @@ glutBitmapWidth(GLUTbitmapFont font, int c) BitmapFontPtr fontinfo; const BitmapCharRec *ch; -#ifdef _WIN32 +#if defined(_WIN32) || defined(GLUT_IMPORT_LIB) fontinfo = (BitmapFontPtr) __glutFont(font); #else fontinfo = (BitmapFontPtr) font; @@ -37,7 +37,7 @@ glutBitmapLength(GLUTbitmapFont font, const unsigned char *string) BitmapFontPtr fontinfo; const BitmapCharRec *ch; -#ifdef _WIN32 +#if defined(_WIN32) || defined(GLUT_IMPORT_LIB) fontinfo = (BitmapFontPtr) __glutFont(font); #else fontinfo = (BitmapFontPtr) font; diff --git a/src/glut/glx/glut_stroke.c b/src/glut/glx/glut_stroke.c index a7af66201f..7569012ec4 100644 --- a/src/glut/glx/glut_stroke.c +++ b/src/glut/glx/glut_stroke.c @@ -18,7 +18,7 @@ glutStrokeCharacter(GLUTstrokeFont font, int c) int i, j; -#if defined(_WIN32) +#if defined(_WIN32) || defined(GLUT_IMPORT_LIB) fontinfo = (StrokeFontPtr) __glutFont(font); #else fontinfo = (StrokeFontPtr) font; diff --git a/src/glut/glx/glut_swidth.c b/src/glut/glx/glut_swidth.c index d999b4d38c..4717bbff5b 100644 --- a/src/glut/glx/glut_swidth.c +++ b/src/glut/glx/glut_swidth.c @@ -15,7 +15,7 @@ glutStrokeWidth(GLUTstrokeFont font, int c) StrokeFontPtr fontinfo; const StrokeCharRec *ch; -#if defined(_WIN32) +#if defined(_WIN32) || defined(GLUT_IMPORT_LIB) fontinfo = (StrokeFontPtr) __glutFont(font); #else fontinfo = (StrokeFontPtr) font; @@ -37,7 +37,7 @@ glutStrokeLength(GLUTstrokeFont font, const unsigned char *string) StrokeFontPtr fontinfo; const StrokeCharRec *ch; -#if defined(_WIN32) +#if defined(_WIN32) || defined(GLUT_IMPORT_LIB) fontinfo = (StrokeFontPtr) __glutFont(font); #else fontinfo = (StrokeFontPtr) font; |