mirror of
https://github.com/Perlmint/glew-cmake.git
synced 2024-11-11 09:33:49 +00:00
OSX makefile refinements - only require GLU in GLEW_APPLE_GLX=1 mode, use -std=c99 for X11/GLX
This commit is contained in:
parent
b34af4d1e3
commit
2906c1c10f
@ -3,13 +3,16 @@ NAME = $(GLEW_NAME)
|
|||||||
CC = cc
|
CC = cc
|
||||||
LD = cc
|
LD = cc
|
||||||
CFLAGS.EXTRA += -dynamic -fno-common
|
CFLAGS.EXTRA += -dynamic -fno-common
|
||||||
CFLAGS.EXTRA += -std=c89 -pedantic
|
CFLAGS.EXTRA += -pedantic
|
||||||
CFLAGS.EXTRA += -fPIC
|
CFLAGS.EXTRA += -fPIC
|
||||||
LDFLAGS.EXTRA =
|
LDFLAGS.EXTRA =
|
||||||
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
||||||
|
CFLAGS.EXTRA += -std=c99
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
||||||
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
||||||
else
|
else
|
||||||
|
CFLAGS.EXTRA += -std=c89
|
||||||
|
GLEW_NO_GLU = -DGLEW_NO_GLU
|
||||||
LDFLAGS.GL = -framework OpenGL
|
LDFLAGS.GL = -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC =
|
LDFLAGS.STATIC =
|
||||||
|
@ -4,17 +4,19 @@ GLEW_DEST = /usr/local
|
|||||||
NAME = $(GLEW_NAME)
|
NAME = $(GLEW_NAME)
|
||||||
CC = gcc-6
|
CC = gcc-6
|
||||||
LD = gcc-6
|
LD = gcc-6
|
||||||
CFLAGS.EXTRA = -dynamic -fno-common
|
CFLAGS.EXTRA += -dynamic -fno-common
|
||||||
CFLAGS.EXTRA += -std=c89
|
|
||||||
CFLAGS.EXTRA += -fPIC
|
CFLAGS.EXTRA += -fPIC
|
||||||
# Lots of warnings with -pedantic
|
# Lots of warnings with -pedantic
|
||||||
# warning: ISO C forbids conversion of object pointer to function pointer type
|
# warning: ISO C forbids conversion of object pointer to function pointer type
|
||||||
#CFLAGS.EXTRA += -pedantic
|
#CFLAGS.EXTRA += -pedantic
|
||||||
LDFLAGS.EXTRA =
|
LDFLAGS.EXTRA =
|
||||||
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
||||||
|
CFLAGS.EXTRA += -std=c99
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
||||||
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
||||||
else
|
else
|
||||||
|
CFLAGS.EXTRA += -std=c89
|
||||||
|
GLEW_NO_GLU = -DGLEW_NO_GLU
|
||||||
LDFLAGS.GL = -framework OpenGL
|
LDFLAGS.GL = -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC =
|
LDFLAGS.STATIC =
|
||||||
|
@ -6,13 +6,16 @@ CC = cc
|
|||||||
LD = cc
|
LD = cc
|
||||||
CFLAGS.EXTRA += -arch ppc
|
CFLAGS.EXTRA += -arch ppc
|
||||||
CFLAGS.EXTRA += -dynamic -fno-common
|
CFLAGS.EXTRA += -dynamic -fno-common
|
||||||
CFLAGS.EXTRA += -std=c89 -pedantic
|
CFLAGS.EXTRA += -pedantic
|
||||||
CFLAGS.EXTRA += -fPIC
|
CFLAGS.EXTRA += -fPIC
|
||||||
LDFLAGS.EXTRA = -arch ppc
|
LDFLAGS.EXTRA = -arch ppc
|
||||||
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
||||||
|
CFLAGS.EXTRA += -std=c99
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
||||||
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
||||||
else
|
else
|
||||||
|
CFLAGS.EXTRA += -std=c89
|
||||||
|
GLEW_NO_GLU = -DGLEW_NO_GLU
|
||||||
LDFLAGS.GL = -framework OpenGL
|
LDFLAGS.GL = -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC =
|
LDFLAGS.STATIC =
|
||||||
|
@ -9,14 +9,17 @@ AR =
|
|||||||
LIBTOOL = libtool -static -o
|
LIBTOOL = libtool -static -o
|
||||||
STRIP =
|
STRIP =
|
||||||
CFLAGS.EXTRA = -dynamic -fno-common
|
CFLAGS.EXTRA = -dynamic -fno-common
|
||||||
CFLAGS.EXTRA += -std=c89 -pedantic
|
CFLAGS.EXTRA += -pedantic
|
||||||
CFLAGS.EXTRA += -fPIC
|
CFLAGS.EXTRA += -fPIC
|
||||||
CFLAGS.EXTRA += -arch i386 -arch x86_64
|
CFLAGS.EXTRA += -arch i386 -arch x86_64
|
||||||
LDFLAGS.EXTRA = -arch i386 -arch x86_64
|
LDFLAGS.EXTRA = -arch i386 -arch x86_64
|
||||||
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
||||||
|
CFLAGS.EXTRA += -std=c99
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
||||||
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
||||||
else
|
else
|
||||||
|
CFLAGS.EXTRA += -std=c89
|
||||||
|
GLEW_NO_GLU = -DGLEW_NO_GLU
|
||||||
LDFLAGS.GL = -framework OpenGL
|
LDFLAGS.GL = -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.DYNAMIC =
|
LDFLAGS.DYNAMIC =
|
||||||
|
@ -4,13 +4,16 @@ CC = cc
|
|||||||
LD = cc
|
LD = cc
|
||||||
CFLAGS.EXTRA += -arch x86_64
|
CFLAGS.EXTRA += -arch x86_64
|
||||||
CFLAGS.EXTRA += -dynamic -fno-common
|
CFLAGS.EXTRA += -dynamic -fno-common
|
||||||
CFLAGS.EXTRA += -std=c89 -pedantic
|
CFLAGS.EXTRA += -pedantic
|
||||||
CFLAGS.EXTRA += -fPIC
|
CFLAGS.EXTRA += -fPIC
|
||||||
LDFLAGS.EXTRA = -arch x86_64
|
LDFLAGS.EXTRA = -arch x86_64
|
||||||
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
ifneq (undefined, $(origin GLEW_APPLE_GLX))
|
||||||
|
CFLAGS.EXTRA += -std=c99
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
|
||||||
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
||||||
else
|
else
|
||||||
|
CFLAGS.EXTRA += -std=c89
|
||||||
|
GLEW_NO_GLU = -DGLEW_NO_GLU
|
||||||
LDFLAGS.GL = -framework OpenGL
|
LDFLAGS.GL = -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC =
|
LDFLAGS.STATIC =
|
||||||
|
Loading…
Reference in New Issue
Block a user