Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
openCARP
meshalyzer
Commits
5c5afff0
Commit
5c5afff0
authored
Jan 08, 2015
by
Edward Vigmond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed for compilation on Mac
parent
a52d281e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
GLee.h
GLee.h
+2
-0
Makefile
Makefile
+8
-2
main.cc
main.cc
+6
-0
No files found.
GLee.h
View file @
5c5afff0
...
...
@@ -762,7 +762,9 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range;
#endif
#ifndef GL_ARB_shader_objects
#if !defined(__APPLE__) && !defined(__APPLE_CC__)
typedef int GLhandleARB;
#endif
typedef char GLcharARB;
#endif
...
...
Makefile
View file @
5c5afff0
...
...
@@ -16,9 +16,15 @@ LIB_CH5 :=
LIB_HDF5
:=
endif
COMMON_LIBS
=
-lpng
-lpthread
-lm
-lz
$(LIB_HDF5)
ifeq
($(HOSTMACHINE), Darwin)
GLUT_LIB
=
-framework
GLUT
else
GLUT_LIB
=
-lglut
endif
COMMON_LIBS
=
$(GLUT_LIB)
$(FLTK_LIBS)
-lpng
-lpthread
-lm
-lz
$(LIB_HDF5)
LIBS
=
-L
$(HDF5API_ROOT)
/lib
-lglut
$(FLTK_LD_FLAGS)
$(COMMON_LIBS)
LIBS
=
-L
$(HDF5API_ROOT)
/lib
$(FLTK_LD_FLAGS)
$(COMMON_LIBS)
LDFLAGS
=
-fopenmp
CXXFLAGS
=
-I
$(HDF5API_ROOT)
/src
$(FLTK_INC)
$(COMMON_INC)
...
...
main.cc
View file @
5c5afff0
...
...
@@ -24,9 +24,15 @@
pid_t
master
;
#else
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
#endif
static
Controls
*
ctrl_ptr
;
static
Meshwin
*
win_ptr
;
...
...
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