GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 07:11:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mirror output SVG in X to conform to SVG and STL coordinate systems having opposite handedness

Browse Source 
Moved standalone-specific files to /src from /xs/src so xs will not try to build them
Modified CMakeLists to match.
This commit is contained in:
Kliment Yanev 2016-06-01 16:16:01 +02:00
parent 9872e9db33
commit d8ef6e9cc1
30 changed files with 102 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/CMakeLists.txt Normal file
View File

@ -0,0 +1,101 @@
cmake_minimum_required (VERSION 2.8)
project (slic3r)
set(workaround "")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.7.0)
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.3)
set(workaround "-fno-inline-small-functions")
endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.3)
endif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.7.0)
set(CMAKE_CXX_FLAGS "-D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE -std=c++14 ${workaround}")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
IF(CMAKE_HOST_APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -framework IOKit -framework CoreFoundation")
ELSE(CMAKE_HOST_APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
ENDIF(CMAKE_HOST_APPLE)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_RUNTIME ON)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_package(Boost COMPONENTS system thread)
set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
include_directories(${LIBDIR})
include_directories(${LIBDIR}/libslic3r)
include_directories(${LIBDIR}/Slic3r/GUI/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/standalone/)
include_directories(${LIBDIR}/admesh/)
include_directories(${LIBDIR}/poly2tri/)
include_directories(${LIBDIR}/poly2tri/sweep)
include_directories(${LIBDIR}/poly2tri/common)
add_library(slic3r_gui STATIC ${LIBDIR}/slic3r/GUI/3DScene.cpp ${LIBDIR}/slic3r/GUI/GUI.cpp)
add_library(libslic3r STATIC ${LIBDIR}/libslic3r/BoundingBox.cpp
${LIBDIR}/libslic3r/ExPolygon.cpp
${LIBDIR}/libslic3r/GCode.cpp
${LIBDIR}/libslic3r/LayerRegion.cpp
${LIBDIR}/libslic3r/PerimeterGenerator.cpp
${LIBDIR}/libslic3r/Polyline.cpp
${LIBDIR}/libslic3r/SurfaceCollection.cpp
${LIBDIR}/libslic3r/BridgeDetector.cpp
${LIBDIR}/libslic3r/Extruder.cpp
${LIBDIR}/libslic3r/GCodeSender.cpp
${LIBDIR}/libslic3r/Line.cpp
${LIBDIR}/libslic3r/PlaceholderParser.cpp
${LIBDIR}/libslic3r/PrintConfig.cpp
${LIBDIR}/libslic3r/Surface.cpp
${LIBDIR}/libslic3r/ClipperUtils.cpp
${LIBDIR}/libslic3r/ExtrusionEntityCollection.cpp
${LIBDIR}/libslic3r/GCodeWriter.cpp
${LIBDIR}/libslic3r/Model.cpp
${LIBDIR}/libslic3r/Point.cpp
${LIBDIR}/libslic3r/Print.cpp
${LIBDIR}/libslic3r/SVG.cpp
${LIBDIR}/libslic3r/SVGExport.cpp
${LIBDIR}/libslic3r/Config.cpp
${LIBDIR}/libslic3r/ExtrusionEntity.cpp
${LIBDIR}/libslic3r/Geometry.cpp
${LIBDIR}/libslic3r/MotionPlanner.cpp
${LIBDIR}/libslic3r/Polygon.cpp
${LIBDIR}/libslic3r/PrintObject.cpp
${LIBDIR}/libslic3r/TriangleMesh.cpp
${LIBDIR}/libslic3r/ExPolygonCollection.cpp
${LIBDIR}/libslic3r/Flow.cpp
${LIBDIR}/libslic3r/Layer.cpp
${LIBDIR}/libslic3r/MultiPoint.cpp
${LIBDIR}/libslic3r/PolylineCollection.cpp
${LIBDIR}/libslic3r/PrintRegion.cpp)
add_library(admesh STATIC ${LIBDIR}/admesh/util.c ${LIBDIR}/admesh/stl_io.c ${LIBDIR}/admesh/stlinit.c ${LIBDIR}/admesh/shared.c ${LIBDIR}/admesh/normals.c ${LIBDIR}/admesh/connect.c)
add_library(clipper STATIC ${LIBDIR}/clipper.cpp)
add_library(polypartition STATIC ${LIBDIR}/polypartition.cpp)
add_library(poly2tri STATIC ${LIBDIR}/poly2tri/sweep/sweep.cc ${LIBDIR}/poly2tri/sweep/sweep_context.cc ${LIBDIR}/poly2tri/sweep/cdt.cc ${LIBDIR}/poly2tri/sweep/advancing_front.cc ${LIBDIR}/poly2tri/common/shapes.cc)
add_executable(slic3r slic3r.cpp)
set_target_properties(slic3r PROPERTIES LINK_SEARCH_START_STATIC 1)
set_target_properties(slic3r PROPERTIES LINK_SEARCH_END_STATIC 1)
set(wxWidgets_USE_STATIC)
SET(wxWidgets_USE_LIBS)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_RUNTIME ON)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_library(bsystem_l boost_system)
add_library(bsystem STATIC IMPORTED)
set_target_properties(bsystem PROPERTIES IMPORTED_LOCATION ${bsystem_l})
find_library(bthread_l boost_thread)
add_library(bthread STATIC IMPORTED)
set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l})
include_directories(${Boost_INCLUDE_DIRS})
#find_package(wxWidgets)
IF(wxWidgets_FOUND)
MESSAGE("wx found!")
INCLUDE("${wxWidgets_USE_FILE}")
target_link_libraries (slic3r slic3r_gui libslic3r admesh clipper polypartition poly2tri bsystem bthread ${wxWidgets_LIBRARIES})
ELSE(wxWidgets_FOUND)
# For convenience. When we cannot continue, inform the user
MESSAGE("wx not found!")
target_link_libraries (slic3r slic3r_gui libslic3r admesh clipper polypartition poly2tri bsystem bthread)
ENDIF(wxWidgets_FOUND)

1
xs/src/slic3r.cpp → src/slic3r.cpp
View File

@ -25,6 +25,7 @@ void exportSVG(const char* stlname, const char* svgname, float layerheight=0.2,
t.repair();
t.scale(scale);
t.rotate_z(rotate);
t.mirror_x();
t.align_to_origin();
SVGExport e(t,layerheight,initialheight);
const char* svgfilename=outname.data();

0
xs/src/standalone/config.h → src/standalone/config.h
View File

0
xs/src/tclap/Arg.h → src/tclap/Arg.h
View File

0
xs/src/tclap/ArgException.h → src/tclap/ArgException.h
View File

0
xs/src/tclap/ArgTraits.h → src/tclap/ArgTraits.h
View File

0
xs/src/tclap/CmdLine.h → src/tclap/CmdLine.h
View File

0
xs/src/tclap/CmdLineInterface.h → src/tclap/CmdLineInterface.h
View File

0
xs/src/tclap/CmdLineOutput.h → src/tclap/CmdLineOutput.h
View File

0
xs/src/tclap/Constraint.h → src/tclap/Constraint.h
View File

0
xs/src/tclap/DocBookOutput.h → src/tclap/DocBookOutput.h
View File

0
xs/src/tclap/HelpVisitor.h → src/tclap/HelpVisitor.h
View File

0
xs/src/tclap/IgnoreRestVisitor.h → src/tclap/IgnoreRestVisitor.h
View File

0
xs/src/tclap/Makefile.am → src/tclap/Makefile.am
View File

0
xs/src/tclap/Makefile.in → src/tclap/Makefile.in
View File

0
xs/src/tclap/MultiArg.h → src/tclap/MultiArg.h
View File

0
xs/src/tclap/MultiSwitchArg.h → src/tclap/MultiSwitchArg.h
View File

0
xs/src/tclap/OptionalUnlabeledTracker.h → src/tclap/OptionalUnlabeledTracker.h
View File

0
xs/src/tclap/StandardTraits.h → src/tclap/StandardTraits.h
View File

0
xs/src/tclap/StdOutput.h → src/tclap/StdOutput.h
View File

0
xs/src/tclap/SwitchArg.h → src/tclap/SwitchArg.h
View File

0
xs/src/tclap/UnlabeledMultiArg.h → src/tclap/UnlabeledMultiArg.h
View File

0
xs/src/tclap/UnlabeledValueArg.h → src/tclap/UnlabeledValueArg.h
View File

0
xs/src/tclap/ValueArg.h → src/tclap/ValueArg.h
View File

0
xs/src/tclap/ValuesConstraint.h → src/tclap/ValuesConstraint.h
View File

0
xs/src/tclap/VersionVisitor.h → src/tclap/VersionVisitor.h
View File

0
xs/src/tclap/Visitor.h → src/tclap/Visitor.h
View File

0
xs/src/tclap/XorHandler.h → src/tclap/XorHandler.h
View File

0
xs/src/tclap/ZshCompletionOutput.h → src/tclap/ZshCompletionOutput.h
View File

98
xs/src/CMakeLists.txt
View File

@ -1,98 +0,0 @@
cmake_minimum_required (VERSION 2.8)
project (slic3r)
set(workaround "")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.7.0)
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.3)
set(workaround "-fno-inline-small-functions")
endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.3)
endif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.7.0)
set(CMAKE_CXX_FLAGS "-D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE -std=c++14 ${workaround}")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
IF(CMAKE_HOST_APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -framework IOKit -framework CoreFoundation")
ELSE(CMAKE_HOST_APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
ENDIF(CMAKE_HOST_APPLE)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_RUNTIME ON)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_package(Boost COMPONENTS system thread)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Slic3r/GUI/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/standalone/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/admesh/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/poly2tri/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/poly2tri/sweep)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/poly2tri/common)
add_library(slic3r_gui STATIC slic3r/GUI/3DScene.cpp slic3r/GUI/GUI.cpp)
add_library(libslic3r STATIC libslic3r/BoundingBox.cpp
libslic3r/ExPolygon.cpp
libslic3r/GCode.cpp
libslic3r/LayerRegion.cpp
libslic3r/PerimeterGenerator.cpp
libslic3r/Polyline.cpp
libslic3r/SurfaceCollection.cpp
libslic3r/BridgeDetector.cpp
libslic3r/Extruder.cpp
libslic3r/GCodeSender.cpp
libslic3r/Line.cpp
libslic3r/PlaceholderParser.cpp
libslic3r/PrintConfig.cpp
libslic3r/Surface.cpp
libslic3r/ClipperUtils.cpp
libslic3r/ExtrusionEntityCollection.cpp
libslic3r/GCodeWriter.cpp
libslic3r/Model.cpp
libslic3r/Point.cpp
libslic3r/Print.cpp
libslic3r/SVG.cpp
libslic3r/SVGExport.cpp
libslic3r/Config.cpp
libslic3r/ExtrusionEntity.cpp
libslic3r/Geometry.cpp
libslic3r/MotionPlanner.cpp
libslic3r/Polygon.cpp
libslic3r/PrintObject.cpp
libslic3r/TriangleMesh.cpp
libslic3r/ExPolygonCollection.cpp
libslic3r/Flow.cpp
libslic3r/Layer.cpp
libslic3r/MultiPoint.cpp
libslic3r/PolylineCollection.cpp
libslic3r/PrintRegion.cpp)
add_library(admesh STATIC admesh/util.c admesh/stl_io.c admesh/stlinit.c admesh/shared.c admesh/normals.c admesh/connect.c)
add_library(clipper STATIC clipper.cpp)
add_library(polypartition STATIC polypartition.cpp)
add_library(poly2tri STATIC poly2tri/sweep/sweep.cc poly2tri/sweep/sweep_context.cc poly2tri/sweep/cdt.cc poly2tri/sweep/advancing_front.cc poly2tri/common/shapes.cc)
add_executable(slic3r slic3r.cpp)
set_target_properties(slic3r PROPERTIES LINK_SEARCH_START_STATIC 1)
set_target_properties(slic3r PROPERTIES LINK_SEARCH_END_STATIC 1)
set(wxWidgets_USE_STATIC)
SET(wxWidgets_USE_LIBS)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_RUNTIME ON)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_library(bsystem_l boost_system)
add_library(bsystem STATIC IMPORTED)
set_target_properties(bsystem PROPERTIES IMPORTED_LOCATION ${bsystem_l})
find_library(bthread_l boost_thread)
add_library(bthread STATIC IMPORTED)
set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l})
include_directories(${Boost_INCLUDE_DIRS})
#find_package(wxWidgets)
IF(wxWidgets_FOUND)
MESSAGE("wx found!")
INCLUDE("${wxWidgets_USE_FILE}")
target_link_libraries (slic3r slic3r_gui libslic3r admesh clipper polypartition poly2tri bsystem bthread ${wxWidgets_LIBRARIES})
ELSE(wxWidgets_FOUND)
# For convenience. When we cannot continue, inform the user
MESSAGE("wx not found!")
target_link_libraries (slic3r slic3r_gui libslic3r admesh clipper polypartition poly2tri bsystem bthread)
ENDIF(wxWidgets_FOUND)