Commit 5c5afff0 authored by Edward Vigmond's avatar Edward Vigmond

Fixed for compilation on Mac

parent a52d281e
......@@ -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
......
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment