vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Windows build fixes from Kliment Yanev

stl_dim
Marius Kintel 2011-06-05 19:55:50 +02:00
parent 8d9c0cccf0
commit c807f9bbd1
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgal.pri
View File

@ -14,7 +14,7 @@ cgal {
}
win32 {
LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc90-mt-gd
LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc90-mt-s
} else {
LIBS += -lgmp -lmpfr -lCGAL
}

2
flex.pri
View File

@ -3,7 +3,7 @@
flex.name = Flex ${QMAKE_FILE_IN}
flex.input = FLEXSOURCES
flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
flex.commands = flex -P ${QMAKE_FILE_BASE} -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
flex.commands = flex -P ${QMAKE_FILE_BASE} -o${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
flex.CONFIG += target_predeps
flex.variable_out = GENERATED_SOURCES
silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands

2
src/cgaladv_minkowski2.cc
View File

@ -85,7 +85,7 @@ CGAL_Poly2 nef2p2(CGAL_Nef_polyhedron2 p)
typedef Explorer::Halfedge_around_face_const_circulator heafcc_t;
Explorer E = p.explorer();
for (fci_t fit = E.faces_begin(), fend = E.faces_end(); fit != fend; ++fit)
for (fci_t fit = E.faces_begin(), facesend = E.faces_end(); fit != facesend; ++fit)
{
if (!E.mark(fit)) {
continue;

15
src/primitives.cc
View File

@ -34,6 +34,8 @@
#include "printutils.h"
#include <assert.h>
#define F_MINIMUM 0.01
enum primitive_type_e {
CUBE,
SPHERE,
@ -57,7 +59,6 @@ class PrimitiveNode : public AbstractPolyNode
public:
bool center;
double x, y, z, h, r1, r2;
static const double F_MINIMUM = 0.01;
double fn, fs, fa;
primitive_type_e type;
int convexity;
@ -106,13 +107,13 @@ AbstractNode *PrimitiveModule::evaluate(const Context *ctx, const ModuleInstanti
node->fs = c.lookup_variable("$fs").num;
node->fa = c.lookup_variable("$fa").num;
if (node->fs < PrimitiveNode::F_MINIMUM) {
PRINTF("WARNING: $fs too small - clamping to %f", PrimitiveNode::F_MINIMUM);
node->fs = PrimitiveNode::F_MINIMUM;
if (node->fs < F_MINIMUM) {
PRINTF("WARNING: $fs too small - clamping to %f", F_MINIMUM);
node->fs = F_MINIMUM;
}
if (node->fa < PrimitiveNode::F_MINIMUM) {
PRINTF("WARNING: $fa too small - clamping to %f", PrimitiveNode::F_MINIMUM);
node->fa = PrimitiveNode::F_MINIMUM;
if (node->fa < F_MINIMUM) {
PRINTF("WARNING: $fa too small - clamping to %f", F_MINIMUM);
node->fa = F_MINIMUM;
}