noclipper

Gbp-Pq: Name noclipper

2 files changed, 6 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 7afb443..e59e230 100644
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,20 @@
 #g++ main.cpp modelFile/modelFile.cpp clipper/clipper.cpp -I. -o CuraEngine
 
 CXX ?= g++
-CFLAGS += -I. -c -Wall -Wextra -O3 -fomit-frame-pointer
+CFLAGS += -I. -c -Wall -Wextra -O3 -fomit-frame-pointer `pkg-config --cflags polyclipping`
 # also include debug symbols
 #CFLAGS+=-ggdb
 LDFLAGS +=
+LDADD += `pkg-config --libs polyclipping`
 SOURCES  = bridge.cpp comb.cpp gcodeExport.cpp infill.cpp inset.cpp layerPart.cpp main.cpp optimizedModel.cpp pathOrderOptimizer.cpp polygonOptimizer.cpp raft.cpp settings.cpp skin.cpp skirt.cpp slicer.cpp support.cpp timeEstimate.cpp
-SOURCES += clipper/clipper.cpp modelFile/modelFile.cpp utils/gettime.cpp utils/logoutput.cpp
+SOURCES += modelFile/modelFile.cpp utils/gettime.cpp utils/logoutput.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 EXECUTABLE = ./CuraEngine
 UNAME := $(shell uname)
 
 ifeq ($(UNAME), Linux)
 	OPEN_HTML=firefox
-	LDFLAGS += --static
+	LDFLAGS +=
 endif
 ifeq ($(UNAME), Darwin)
 	OPEN_HTML=open
@@ -36,7 +37,7 @@ endif
 all: $(SOURCES) $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
-	$(CXX) $(LDFLAGS) $(OBJECTS) -o $@
+	$(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
 
 .cpp.o:
 	$(CXX) $(CFLAGS) $< -o $@
diff --git a/utils/intpoint.h b/utils/intpoint.h
index d78b38c..84e1a0e 100644
--- a/utils/intpoint.h
+++ b/utils/intpoint.h
@@ -9,7 +9,7 @@ Integer points are used to avoid floating point rounding errors, and because Cli
 #define INLINE static inline

 

 //Include Clipper to get the ClipperLib::IntPoint definition, which we reuse as Point definition.

-#include "clipper/clipper.hpp"

+#include <clipper.hpp>

 

 #include <limits.h>

 #include <stdint.h>