From 20a041e0efd02b481b91c1df93d112150b09854f Mon Sep 17 00:00:00 2001 From: whitequark Date: Tue, 3 Nov 2015 22:05:20 +0300 Subject: [PATCH] DXF: initial libdxfrw import. We had to fork libdxfrw since the upstream doesn't have a git repository, a CMake buildsystem, and is quite buggy. libdxfrw is also used in LibreCAD, but they just vendored their version. --- .gitmodules | 3 +++ CMakeLists.txt | 5 ++++- extlib/libdxfrw | 1 + src/CMakeLists.txt | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 extlib/libdxfrw diff --git a/.gitmodules b/.gitmodules index 342149a..58637a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ [submodule "extlib/libfreetype"] path = extlib/libfreetype url = http://git.sv.nongnu.org/r/freetype/freetype2.git +[submodule "extlib/libdxfrw"] + path = extlib/libdxfrw + url = https://github.com/whitequark/libdxfrw.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f0014c..7495d32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,9 @@ CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) find_package(OpenGL REQUIRED) +message(STATUS "Using in-tree libdxfrw") +add_subdirectory(extlib/libdxfrw) + if(WIN32) # We don't want any of the subprojects to install anything. # We don't actually install anything on Windows (so overriding @@ -103,9 +106,9 @@ if(WIN32) if(NOT ZLIB_FOUND) message(STATUS "Using in-tree zlib") - add_subdirectory(extlib/zlib) + message(STATUS "Using in-tree libpng") set(ZLIB_LIBRARY zlibstatic) set(ZLIB_INCLUDE_DIR diff --git a/extlib/libdxfrw b/extlib/libdxfrw new file mode 160000 index 0000000..a6f7c0a --- /dev/null +++ b/extlib/libdxfrw @@ -0,0 +1 @@ +Subproject commit a6f7c0a9ff7b9dd847a1c673f7c414c3e10c4022 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1f12fe..164da8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -319,6 +319,7 @@ add_executable(solvespace WIN32 MACOSX_BUNDLE ${solvespace_SOURCES}) target_link_libraries(solvespace + dxfrw ${OPENGL_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}