Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
glew
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Maik Froechtenicht
glew
Commits
2906c1c1
Commit
2906c1c1
authored
Apr 23, 2017
by
Nigel Stewart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OSX makefile refinements - only require GLU in GLEW_APPLE_GLX=1 mode, use -std=c99 for X11/GLX
parent
b34af4d1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
6 deletions
+20
-6
config/Makefile.darwin
config/Makefile.darwin
+4
-1
config/Makefile.darwin-gcc6
config/Makefile.darwin-gcc6
+4
-2
config/Makefile.darwin-ppc
config/Makefile.darwin-ppc
+4
-1
config/Makefile.darwin-universal
config/Makefile.darwin-universal
+4
-1
config/Makefile.darwin-x86_64
config/Makefile.darwin-x86_64
+4
-1
No files found.
config/Makefile.darwin
View file @
2906c1c1
...
...
@@ -3,13 +3,16 @@ NAME = $(GLEW_NAME)
CC
=
cc
LD
=
cc
CFLAGS.EXTRA
+=
-dynamic
-fno-common
CFLAGS.EXTRA
+=
-
std
=
c89
-
pedantic
CFLAGS.EXTRA
+=
-pedantic
CFLAGS.EXTRA
+=
-fPIC
LDFLAGS.EXTRA
=
ifneq
(undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA
+=
-std
=
c99
CFLAGS.EXTRA
+=
-I
/usr/X11R6/include
-D
'GLEW_APPLE_GLX'
LDFLAGS.GL
=
-L
/usr/X11R6/lib
-lGL
-lX11
else
CFLAGS.EXTRA
+=
-std
=
c89
GLEW_NO_GLU
=
-DGLEW_NO_GLU
LDFLAGS.GL
=
-framework
OpenGL
endif
LDFLAGS.STATIC
=
...
...
config/Makefile.darwin-gcc6
View file @
2906c1c1
...
...
@@ -4,17 +4,19 @@ GLEW_DEST = /usr/local
NAME
=
$(GLEW_NAME)
CC
=
gcc-6
LD
=
gcc-6
CFLAGS.EXTRA
=
-dynamic
-fno-common
CFLAGS.EXTRA
+=
-std
=
c89
CFLAGS.EXTRA
+=
-dynamic
-fno-common
CFLAGS.EXTRA
+=
-fPIC
# Lots of warnings with -pedantic
# warning: ISO C forbids conversion of object pointer to function pointer type
#CFLAGS.EXTRA += -pedantic
LDFLAGS.EXTRA
=
ifneq
(undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA
+=
-std
=
c99
CFLAGS.EXTRA
+=
-I
/usr/X11R6/include
-D
'GLEW_APPLE_GLX'
LDFLAGS.GL
=
-L
/usr/X11R6/lib
-lGL
-lX11
else
CFLAGS.EXTRA
+=
-std
=
c89
GLEW_NO_GLU
=
-DGLEW_NO_GLU
LDFLAGS.GL
=
-framework
OpenGL
endif
LDFLAGS.STATIC
=
...
...
config/Makefile.darwin-ppc
View file @
2906c1c1
...
...
@@ -6,13 +6,16 @@ CC = cc
LD
=
cc
CFLAGS.EXTRA
+=
-arch
ppc
CFLAGS.EXTRA
+=
-dynamic
-fno-common
CFLAGS.EXTRA
+=
-
std
=
c89
-
pedantic
CFLAGS.EXTRA
+=
-pedantic
CFLAGS.EXTRA
+=
-fPIC
LDFLAGS.EXTRA
=
-arch
ppc
ifneq
(undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA
+=
-std
=
c99
CFLAGS.EXTRA
+=
-I
/usr/X11R6/include
-D
'GLEW_APPLE_GLX'
LDFLAGS.GL
=
-L
/usr/X11R6/lib
-lGL
-lX11
else
CFLAGS.EXTRA
+=
-std
=
c89
GLEW_NO_GLU
=
-DGLEW_NO_GLU
LDFLAGS.GL
=
-framework
OpenGL
endif
LDFLAGS.STATIC
=
...
...
config/Makefile.darwin-universal
View file @
2906c1c1
...
...
@@ -9,14 +9,17 @@ AR =
LIBTOOL
=
libtool
-static
-o
STRIP
=
CFLAGS.EXTRA
=
-dynamic
-fno-common
CFLAGS.EXTRA
+=
-
std
=
c89
-
pedantic
CFLAGS.EXTRA
+=
-pedantic
CFLAGS.EXTRA
+=
-fPIC
CFLAGS.EXTRA
+=
-arch
i386
-arch
x86_64
LDFLAGS.EXTRA
=
-arch
i386
-arch
x86_64
ifneq
(undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA
+=
-std
=
c99
CFLAGS.EXTRA
+=
-I
/usr/X11R6/include
-D
'GLEW_APPLE_GLX'
LDFLAGS.GL
=
-L
/usr/X11R6/lib
-lGL
-lX11
else
CFLAGS.EXTRA
+=
-std
=
c89
GLEW_NO_GLU
=
-DGLEW_NO_GLU
LDFLAGS.GL
=
-framework
OpenGL
endif
LDFLAGS.DYNAMIC
=
...
...
config/Makefile.darwin-x86_64
View file @
2906c1c1
...
...
@@ -4,13 +4,16 @@ CC = cc
LD
=
cc
CFLAGS.EXTRA
+=
-arch
x86_64
CFLAGS.EXTRA
+=
-dynamic
-fno-common
CFLAGS.EXTRA
+=
-
std
=
c89
-
pedantic
CFLAGS.EXTRA
+=
-pedantic
CFLAGS.EXTRA
+=
-fPIC
LDFLAGS.EXTRA
=
-arch
x86_64
ifneq
(undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA
+=
-std
=
c99
CFLAGS.EXTRA
+=
-I
/usr/X11R6/include
-D
'GLEW_APPLE_GLX'
LDFLAGS.GL
=
-L
/usr/X11R6/lib
-lGL
-lX11
else
CFLAGS.EXTRA
+=
-std
=
c89
GLEW_NO_GLU
=
-DGLEW_NO_GLU
LDFLAGS.GL
=
-framework
OpenGL
endif
LDFLAGS.STATIC
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment