Commit a7067c71 authored by Edward Vigmond's avatar Edward Vigmond
Browse files

Adjustments to compile on Mac

parent f4ac1b1b
#include "CutSurfaces.h"
#include <string.h>
#include <VecData.h>
#include "VecData.h"
#include <stdlib.h>
const int ADD_INC = 1000;
......
#include <GLee.h>
#include "GLee.h"
#include "Frame.h"
#ifdef OSMESA
......
// shared
#include <VecData.h>
#include "VecData.h"
// project
#include "IsoSurface.h"
......
......@@ -6,6 +6,12 @@ FLTK_INC := $(shell fltk-config --use-glut --use-gl --cxxflags)
FLTK_LD_FLAGS := $(shell fltk-config --use-images --use-glut --use-gl --ldflags)
COMMON_INC := -I. -O0 -g -DOBJ_CLASS -D_REENTRANT -MMD -DNOMINMAX #-fopenmp
FLTK_SOURCES = $(wildcard *.fl)
OBJS := $(FLTK_SOURCES:.fl=.o)\
$(patsubst %.cc,%.o,$(wildcard *.cc))\
$(patsubst %.c,%.o,$(wildcard *.c))\
$(patsubst %.C,%.o,$(wildcard *.C))
#HDF5=1
ifdef HDF5
LIB_CH5 := (HDF5_ROOT)/lib/libch5.a
......@@ -14,6 +20,7 @@ COMMON_INC += -DUSE_HDF5
else
LIB_CH5 :=
LIB_HDF5 :=
OBJS := $(OBJS:HDF5DataBrowser.o=)
endif
ifeq ($(HOSTMACHINE), Darwin)
......@@ -33,12 +40,6 @@ ifdef ENABLE_LOGGING
CPPFLAGS += -DLOGGING_ENABLED
endif
FLTK_SOURCES = $(wildcard *.fl)
OBJS = $(FLTK_SOURCES:.fl=.o)\
$(patsubst %.cc,%.o,$(wildcard *.cc))\
$(patsubst %.c,%.o,$(wildcard *.c))\
$(patsubst %.C,%.o,$(wildcard *.C))
#the files in OS_files contain OSMESA dependent clauses
OS_files= main.o Frame.o
OS_OBJS=$(filter-out $(OS_files),$(OBJS)) $(OS_files:.o=_os.o)
......
#include "Surfaces.h"
#include <string.h>
#include <VecData.h>
#include "VecData.h"
Surfaces::Surfaces( PPoint *pl ) : _p(pl), is_visible(true),_filled(true),
_outline(false),_vertnorm(NULL)
......
......@@ -1148,8 +1148,9 @@ TBmeshWin::illuminate( GLfloat max )
glEnable(GL_COLOR_MATERIAL);
// Create a Directional Light Source
GLfloat dir[] = { contwin->lightx->value(),
contwin->lighty->value(), contwin->lightz->value(), 0. };
GLfloat dir[] = { (GLfloat)contwin->lightx->value(),
(GLfloat)contwin->lighty->value(),
(GLfloat)contwin->lightz->value(), 0. };
normalize( dir );
if ( headlamp_mode ) {
glLightfv(GL_LIGHT2, GL_POSITION, dir);
......@@ -1980,7 +1981,7 @@ TBmeshWin::signal_links( int dir )
if( meshProcSem==SEM_FAILED ) return;
// make sure we start at zero
int numsem;
int numsem=0;
sem_getvalue( meshProcSem, &numsem );
for( int i=0; i<numsem; i++ )
sem_wait( meshProcSem );
......
# data file for the Fltk User Interface Designer (fluid)
version 1.0300
version 1.0302
header_name {.h}
code_name {.cc}
decl {\#include "Surfaces.h"} {public local
......@@ -84,7 +84,7 @@ class Controls {open
xywh {0 0 350 30} labelcolor 1
} {
Submenu {} {
label File
label File selected
xywh {0 0 100 20}
} {
MenuItem {} {
......@@ -173,7 +173,9 @@ if( fn ) mwtb->read_dynamic_pts( fn, tmslider );}
}
MenuItem hdfreadbut {
label {Read HDF5 Data}
callback {HDF5DataBrowser *brow = new HDF5DataBrowser( fl_file_chooser("Choose HDF5 data file", "*.datH5", NULL ), mwtb );}
callback {\#ifdef HAVE_HDF5
HDF5DataBrowser *brow = new HDF5DataBrowser( fl_file_chooser("Choose HDF5 data file", "*.datH5", NULL ), mwtb );
\#endif}
xywh {0 0 30 20}
}
MenuItem read_recalibrate {
......@@ -784,7 +786,7 @@ op->win->show();}
xywh {10 270 330 220} align 0
} {
Fl_Group hilightgrp {
label Highlight selected
label Highlight
xywh {10 305 330 185} color 11 labelfont 1 labelsize 12 labelcolor 121 align 4
} {
Fl_Value_Input tethi {
......
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