From 7e1fac8f762de794150e219f8a05c5a7ce9bc8f5 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sun, 6 Dec 2015 12:54:01 +0100
Subject: [PATCH] Separate libslic3r code from slic3r application code

---
 xs/MANIFEST                                  | 8 ++++----
 xs/src/{libslic3r => slic3r}/GUI/3DScene.cpp | 0
 xs/src/{libslic3r => slic3r}/GUI/3DScene.hpp | 6 +++---
 xs/src/{libslic3r => slic3r}/GUI/GUI.cpp     | 0
 xs/src/{libslic3r => slic3r}/GUI/GUI.hpp     | 0
 xs/xsp/GUI.xsp                               | 2 +-
 xs/xsp/GUI_3DScene.xsp                       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename xs/src/{libslic3r => slic3r}/GUI/3DScene.cpp (100%)
 rename xs/src/{libslic3r => slic3r}/GUI/3DScene.hpp (92%)
 rename xs/src/{libslic3r => slic3r}/GUI/GUI.cpp (100%)
 rename xs/src/{libslic3r => slic3r}/GUI/GUI.hpp (100%)

diff --git a/xs/MANIFEST b/xs/MANIFEST
index bc42a7e57..8cdbbb617 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -38,10 +38,6 @@ src/libslic3r/GCodeWriter.cpp
 src/libslic3r/GCodeWriter.hpp
 src/libslic3r/Geometry.cpp
 src/libslic3r/Geometry.hpp
-src/libslic3r/GUI/GUI.cpp
-src/libslic3r/GUI/GUI.hpp
-src/libslic3r/GUI/3DScene.cpp
-src/libslic3r/GUI/3DScene.hpp
 src/libslic3r/Layer.cpp
 src/libslic3r/Layer.hpp
 src/libslic3r/LayerRegion.cpp
@@ -99,6 +95,10 @@ src/poly2tri/sweep/sweep_context.h
 src/polypartition.cpp
 src/polypartition.h
 src/ppport.h
+src/slic3r/GUI/GUI.cpp
+src/slic3r/GUI/GUI.hpp
+src/slic3r/GUI/3DScene.cpp
+src/slic3r/GUI/3DScene.hpp
 t/01_trianglemesh.t
 t/03_point.t
 t/04_expolygon.t
diff --git a/xs/src/libslic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp
similarity index 100%
rename from xs/src/libslic3r/GUI/3DScene.cpp
rename to xs/src/slic3r/GUI/3DScene.cpp
diff --git a/xs/src/libslic3r/GUI/3DScene.hpp b/xs/src/slic3r/GUI/3DScene.hpp
similarity index 92%
rename from xs/src/libslic3r/GUI/3DScene.hpp
rename to xs/src/slic3r/GUI/3DScene.hpp
index df2531778..5552b7310 100644
--- a/xs/src/libslic3r/GUI/3DScene.hpp
+++ b/xs/src/slic3r/GUI/3DScene.hpp
@@ -2,9 +2,9 @@
 #define slic3r_3DScene_hpp_
 
 #include <myinit.h>
-#include "../Point.hpp"
-#include "../Line.hpp"
-#include "../TriangleMesh.hpp"
+#include "../../libslic3r/Point.hpp"
+#include "../../libslic3r/Line.hpp"
+#include "../../libslic3r/TriangleMesh.hpp"
 
 namespace Slic3r {
 
diff --git a/xs/src/libslic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
similarity index 100%
rename from xs/src/libslic3r/GUI/GUI.cpp
rename to xs/src/slic3r/GUI/GUI.cpp
diff --git a/xs/src/libslic3r/GUI/GUI.hpp b/xs/src/slic3r/GUI/GUI.hpp
similarity index 100%
rename from xs/src/libslic3r/GUI/GUI.hpp
rename to xs/src/slic3r/GUI/GUI.hpp
diff --git a/xs/xsp/GUI.xsp b/xs/xsp/GUI.xsp
index 165a68b79..24e1fa8b9 100644
--- a/xs/xsp/GUI.xsp
+++ b/xs/xsp/GUI.xsp
@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "libslic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/GUI.hpp"
 %}
 
 
diff --git a/xs/xsp/GUI_3DScene.xsp b/xs/xsp/GUI_3DScene.xsp
index 7e692326d..86694fbaa 100644
--- a/xs/xsp/GUI_3DScene.xsp
+++ b/xs/xsp/GUI_3DScene.xsp
@@ -1,7 +1,7 @@
 %module{Slic3r::XS};
 
 #include <myinit.h>
-#include "libslic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/3DScene.hpp"
 
 %name{Slic3r::GUI::_3DScene::GLVertexArray} class GLVertexArray {
     GLVertexArray();