From c849b3f00b43a2ef14b872642a31d755fd8e513f Mon Sep 17 00:00:00 2001 From: Paul Steinbrecher Date: Wed, 8 Aug 2018 17:23:15 -0600 Subject: [PATCH] Update support for Cygwin 2.10.0 without X11. Based on MSYS toolchain config. --- config/Makefile.cygwin | 3 ++- config/Makefile.cygwin-x11 | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 config/Makefile.cygwin-x11 diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index bc7e2fd..f4be222 100644 --- a/config/Makefile.cygwin +++ b/config/Makefile.cygwin @@ -4,9 +4,10 @@ GLEW_DEST ?= /usr CC := cc LD := cc LN := +CFLAGS.EXTRA += -D_WIN32 LDFLAGS.EXTRA = LIBDIR = $(GLEW_DEST)/lib -LDFLAGS.GL = -lGL -lX11 +LDFLAGS.GL = -lOpenGL32 -mwindows LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic WARN = -Wall -W diff --git a/config/Makefile.cygwin-x11 b/config/Makefile.cygwin-x11 new file mode 100644 index 0000000..bc7e2fd --- /dev/null +++ b/config/Makefile.cygwin-x11 @@ -0,0 +1,19 @@ +NAME = GLEW +GLEW_DEST ?= /usr +# use gcc for linking, with ld it does not work +CC := cc +LD := cc +LN := +LDFLAGS.EXTRA = +LIBDIR = $(GLEW_DEST)/lib +LDFLAGS.GL = -lGL -lX11 +LDFLAGS.STATIC = -Wl,-Bstatic +LDFLAGS.DYNAMIC = -Wl,-Bdynamic +WARN = -Wall -W +POPT = -O2 +BIN.SUFFIX = .exe +LIB.SONAME = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll +LIB.DEVLNK = lib$(NAME).dll.a +LIB.SHARED = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll +LIB.STATIC = lib$(NAME).a +LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK)