From 2e56d766c72808b6d0a048fc85aa9a40bc57021f Mon Sep 17 00:00:00 2001 From: ikits Date: Fri, 2 Mar 2007 17:22:15 +0000 Subject: [PATCH] fix cygming build git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@486 783a27ee-832a-0410-bc00-9f386506c6dd --- auto/src/glew_head.h | 2 +- config/Makefile.cygming | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index 0d8a67b..8304e73 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -18,7 +18,7 @@ #define __GLEXT_H_ #define __gl_ATI_h_ -#if defined(_WIN32) || defined(__MINGW32__) +#if defined(_WIN32) /* * GLEW does not include to avoid name space pollution. diff --git a/config/Makefile.cygming b/config/Makefile.cygming index a39b24c..d1d6062 100644 --- a/config/Makefile.cygming +++ b/config/Makefile.cygming @@ -1,4 +1,8 @@ NAME = glew32 +GLEW_DEST = /usr +BINDIR = /usr/bin +LIBDIR = /usr/lib/mingw +INCDIR = /usr/include/mingw/GL CC = gcc -mno-cygwin # use gcc for linking, with ld it does not work LD = gcc -mno-cygwin @@ -6,10 +10,9 @@ ifneq (undefined, $(origin GLEW_MX)) CFLAGS.EXTRA = -DGLEW_MX endif CFLAGS.SO = -DGLEW_BUILD -#LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32 -LDFLAGS.EXTRA = -L/mingw/lib +LDFLAGS.EXTRA = -L$(LIBDIR) WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe