diff options
| author | Marius Kintel <marius@kintel.net> | 2011-06-05 17:55:50 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-06-05 17:55:50 (GMT) |
| commit | c807f9bbd1622292b32eb39c21133d7a0a548fc8 (patch) | |
| tree | 98ef197205a63b74e434571b00be4fbcadd25ddd | |
| parent | 8d9c0cccf07bac61c8ed4bb26c6007cccc218008 (diff) | |
Windows build fixes from Kliment Yanev
| -rw-r--r-- | cgal.pri | 2 | ||||
| -rw-r--r-- | flex.pri | 2 | ||||
| -rw-r--r-- | src/cgaladv_minkowski2.cc | 2 | ||||
| -rw-r--r-- | src/primitives.cc | 15 |
4 files changed, 11 insertions, 10 deletions
@@ -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 } @@ -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
diff --git a/src/cgaladv_minkowski2.cc b/src/cgaladv_minkowski2.cc index 8d0bf62..b722708 100644 --- a/src/cgaladv_minkowski2.cc +++ b/src/cgaladv_minkowski2.cc @@ -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; diff --git a/src/primitives.cc b/src/primitives.cc index e2e5602..5180c16 100644 --- a/src/primitives.cc +++ b/src/primitives.cc @@ -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; } |