version update 1.2.0

This reverts commit d27a42ce90.

.clang-format

@@ -3,11 +3,11 @@
 #
 Language:        Cpp
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: true
+AlignAfterOpenBracket: BlockIndent
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: DontAlign
-AlignOperands:   true
+AlignOperands:   false
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: true
@@ -25,7 +25,7 @@ BraceWrapping:
   AfterClass:      true
   AfterControlStatement: false
   AfterEnum:       false
-  AfterFunction:   true
+  AfterFunction:   false
   AfterNamespace:  false
   AfterObjCDeclaration: false
   AfterStruct:     true
@@ -46,7 +46,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
-ColumnLimit:     140
+ColumnLimit:     100
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: true

.gitignore

@@ -21,5 +21,4 @@ deps/build-linux/*
 **/.idea/
 .pkg_cache
 CMakeUserPresets.json
-/resources/profiles
 /src/slic3r/QIDI

CMakeLists.txt

@@ -32,7 +32,13 @@ option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)
 option(SLIC3R_ASAN              "Enable ASan on Clang and GCC" 0)
 option(SLIC3R_UBSAN             "Enable UBSan on Clang and GCC" 0)
 option(SLIC3R_ENABLE_FORMAT_STEP "Enable compilation of STEP file support" ON)
-# If SLIC3R_FHS is 1 -> SLIC3R_DESKTOP_INTEGRATION is always 0, othrewise variable.
+option(SLIC3R_LOG_TO_FILE       "Enable logging into file")
+option(SLIC3R_REPO_URL          "Preset repo URL")
+
+# SLIC3R_OPENGL_ES can be enabled only if SLIC3R_GUI is enabled.
+CMAKE_DEPENDENT_OPTION(SLIC3R_OPENGL_ES "Compile QIDISlicer targeting OpenGL ES" OFF "SLIC3R_GUI" OFF)
+
+# If SLIC3R_FHS is 1 -> SLIC3R_DESKTOP_INTEGRATION is always 0, otherwise variable.
 CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_INTEGRATION "Allow perfoming desktop integration during runtime" 1 "NOT SLIC3R_FHS" 0)
 
 set(OPENVDB_FIND_MODULE_PATH "" CACHE PATH "Path to OpenVDB installation's find modules.")
@@ -57,6 +63,7 @@ set(${PROJECT_NAME}_DEPS_BUILD_DIR "" CACHE PATH "Binary dir of the dependencies
 if (${PROJECT_NAME}_BUILD_DEPS)
     include(deps/autobuild.cmake)
 endif ()
+
 if (APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)
     set(CMAKE_FIND_APPBUNDLE LAST)
@@ -83,10 +90,20 @@ foreach (_cache_var ${_cache_vars})
     endif ()
 endforeach()
 
+if (SLIC3R_LOG_TO_FILE)
+    add_definitions(-DSLIC3R_LOG_TO_FILE)
+endif ()
+if (SLIC3R_REPO_URL)
+    add_definitions(-DSLIC3R_REPO_URL="${SLIC3R_REPO_URL}")
+endif()
 if (SLIC3R_GUI)
     add_definitions(-DSLIC3R_GUI)
 endif ()
 
+if (SLIC3R_OPENGL_ES)
+    add_definitions(-DSLIC3R_OPENGL_ES)
+endif()
+
 if(SLIC3R_DESKTOP_INTEGRATION)
     add_definitions(-DSLIC3R_DESKTOP_INTEGRATION)
 endif ()
@@ -163,7 +180,6 @@ if(NOT WIN32)
     add_compile_options("$<$<CONFIG:DEBUG>:-DDEBUG>")
 endif()
 
-
 # WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory.
 # We pick it from environment if it is not defined in another way
 if(WIN32)
@@ -173,8 +189,8 @@ if(WIN32)
         endif()
     endif()
     if(DEFINED WIN10SDK_PATH)
-        if (EXISTS "${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h")
-            set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}")
+        if (EXISTS "${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h")
+            set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}/Include")
         else()
             message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
             message("${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h was not found")
@@ -221,7 +237,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package(Threads REQUIRED)
 
     find_package(DBus REQUIRED)
-    include_directories(${DBUS_INCLUDE_DIRS})
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
@@ -314,11 +329,7 @@ if (APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=partial-availability -Werror=unguarded-availability -Werror=unguarded-availability-new")
 endif ()
 
-# Where all the bundled libraries reside?
-set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 set(LIBDIR_BIN ${CMAKE_CURRENT_BINARY_DIR}/src)
-# For the bundled boost libraries (boost::nowide)
-include_directories(${LIBDIR})
 # For generated header files
 include_directories(${LIBDIR_BIN}/platform)
 
@@ -350,9 +361,11 @@ endif()
 # boost::process was introduced first in version 1.64.0,
 # boost::beast::detail::base64 was introduced first in version 1.66.0
 set(MINIMUM_BOOST_VERSION "1.66.0")
-set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams")
+set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
 find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
 
+find_package(Eigen3 3.3.7 REQUIRED)
+
 add_library(boost_libs INTERFACE)
 add_library(boost_headeronly INTERFACE)
 
@@ -433,26 +446,18 @@ endif()
 
 ## OPTIONAL packages
 
-# Find eigen3 or use bundled version
-if (NOT SLIC3R_STATIC)
-    find_package(Eigen3 3.3)
-endif ()
-if (NOT EIGEN3_FOUND)
-    set(EIGEN3_FOUND 1)
-    set(EIGEN3_INCLUDE_DIR ${LIBDIR}/eigen/)
-endif ()
-include_directories(BEFORE SYSTEM ${EIGEN3_INCLUDE_DIR})
-
 # Find expat. We have our overriden FindEXPAT which exports libexpat target
 # no matter what.
 find_package(EXPAT REQUIRED)
 
 add_library(libexpat INTERFACE)
 
-if (TARGET EXPAT::EXPAT )
+if (TARGET EXPAT::EXPAT ) # found by a newer Find script
     target_link_libraries(libexpat INTERFACE EXPAT::EXPAT)
-elseif(TARGET expat::expat)
+elseif(TARGET expat::expat) # found by a config script
     target_link_libraries(libexpat INTERFACE expat::expat)
+else() # found by an older Find script
+    target_link_libraries(libexpat INTERFACE ${EXPAT_LIBRARIES})
 endif ()
 
 find_package(PNG REQUIRED)
@@ -593,17 +598,16 @@ function(qidislicer_copy_dlls target)
         COMMAND ${CMAKE_COMMAND} -E copy ${TOP_LEVEL_PROJECT_DIR}/deps/+MPFR/mpfr/lib/win${_bits}/libmpfr-4.dll ${_out_dir}
         COMMENT "Copy mpfr runtime to build tree"
         VERBATIM)
-
 endfunction()
 
-
+add_subdirectory(build-utils)
+add_subdirectory(bundled_deps)
 # libslic3r, QIDISlicer GUI and the QIDISlicer executable.
 add_subdirectory(src)
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT QIDISlicer_app_console)
 
 add_dependencies(gettext_make_pot hintsToPot)
 
-
 if(SLIC3R_BUILD_SANDBOXES)
     add_subdirectory(sandboxes)
 endif()
@@ -639,4 +643,4 @@ else ()
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
 
-configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)
+configure_file(src/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)

LICENSE

@@ -1,7 +1,7 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -633,8 +633,8 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

README.md

@@ -4,32 +4,123 @@
 # QIDISlicer
 QIDISlicer is a professional 3D printer slicing software，which is perfectly compatible with all printers and 3D printing filaments of QIDI Technology. Multi-platform support, simple inerface, easy to use, complate functions, easy to learn 3D printing.
 
-**Notice:QIDISlicer as a new software dedicated to QIDI's new high speed printers, please make sure your firmware version is V 4.0.0 or above.**
-
 QIDISlicer is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
 Thanks to PrusaSlicer, Bambulab and OrcaSlicer for their contributions to the 3D printing community.
 
 See the [QIDI's homepage](https://qidi3d.com) for more information.
 
-### Firmware
+<details open>
+  <summary>Content Navigation</summary>
+  <ol>
+    <li>
+      <a href="#function-introduction">Function Introduction</a>
+    </li>
+    <li>
+      <a href="#wiki">Wiki</a>
+    </li>
+    <li>
+      <a href="#Supporting-QIDI-Link-App">Supporting QIDI Link App</a>
+    </li>
+    <li>
+      <a href="#report-issues-and-make-suggestions">Report Issues and Make Suggestions</a>
+      <ul>
+        <li><a href="#some-formatting-requirements">Some Formatting Requirements</a></li>
+      </ul>
+    </li>
+    <li>
+      <a href="#license">License</a>
+    </li>
+  </ol>
+</details>
 
-You can find the printer's firmware here:
+----
 
-[Q1 Pro](https://github.com/QIDITECH/QIDI_Q1_Pro)
+## Function Introduction
 
-[X-MAX 3](https://github.com/QIDITECH/QIDI_MAX3)
+<p align="center">
+  <img src="/readmeRes/UI.png" alt="UI">
+</p>
 
-[X-Plus 3](https://github.com/QIDITECH/QIDI_PLUS3)
+### Key features are:
 
-[X-smart 3](https://github.com/QIDITECH/QIDI_SMART3)
+* **Slicer:** Fast and stable 3D model slicer
+* **Printer:** Perfect compatibility with all high-speed 3D printers of QIDI TECH
+* **Filament:** Perfect compatibility with all filaments of QIDI TECH and some general filaments
+* **LAN:** The printer can be directly connected through IP, convenient, safe and stable
+* **Internet:** Remote connection, start printing anytime, anywhere
 
-### Report Issues and Make Suggestions
+### Other major features are:
 
-Please send your question in the form of video or pictures to us through the [After-Sales Service](https://qidi3d.com/pages/warranty-policy-after-sales-support), we will reply to your information within 12 hours.
+* **Model:** A variety of model operations, move, scale, rotate, crop, color, repair, combine, split, and more
+* **Parameter:** Rich parameter Settings, fine adjustment for a variety of complex models and application scenarios
+* **Calibration:** Multiple calibration functions to adjust the best parameters according to the actual situation
 
-Please try to contact us through [After-Sales Service](https://qidi3d.com/pages/warranty-policy-after-sales-support) and report problems or suggestions. On github, we cannot obtain your order information, operation records and other private intelligence, nor can we generate after-sales orders, send repair files, etc. Thank you for your understanding and cooperation.
+----
 
-### License
+## wiki
+
+The wiki below aims to provide a detailed explanation of the QIDISlicer settings, how to get the most out of them as
+well as how to calibrate and setup your printer.
+
+The wiki is work in progress so bear with us while we get it up and running!
+
+**[Access the wiki here](https://wiki.qidi3d.com/en/software/QIDISlicier)**
+
+----
+
+## Supporting QIDI Link App
+
+**[Access QIDI Link App Guide Here](https://wiki.qidi3d.com/en/app)**
+
+The supporting QIDI Link App supports IOS and Android platforms. In the app, you can scan the code to connect to the printer, remotely monitor the printer's printing progress, control the printer's printing parameters, and perform operations such as feeding and returning materials.
+<p align="center">
+  <img src="/readmeRes/qidilink.png" alt="Add filament option ——Seal">
+</p>
+
+----
+
+## Report Issues and Make Suggestions
+
+Please send your question in the form of video or pictures to us through
+the [After-Sales Service](https://qidi3d.com/pages/warranty-policy-after-sales-support), we will reply to your
+information within 12 hours.
+
+Please try to contact us through [After-Sales Service](https://qidi3d.com/pages/warranty-policy-after-sales-support) and
+report problems or suggestions. On github, we cannot obtain your order information, operation records and other private
+intelligence, nor can we generate after-sales orders, send repair files, etc. Thank you for your understanding and
+cooperation.
+
+### Some formatting requirements
+
+#### Issue Title:
+
+Briefly describe the issue (e.g., `could not open file`)
+
+#### Description:
+
+Provide a detailed description of the issue.This will help our engineers quickly locate the problem and assist you in
+resolving it
+
+- **Issue Description**:
+    - A clear explanation of the problem.
+    - Compare the expected behavior with the actual behavior.
+
+- **Steps to Reproduce**:
+    1. Step one
+    2. Step two
+    3. Step three
+
+    - Specific steps to reproduce the issue. Include a precise sequence of actions if possible.
+
+- **Additional Information**:
+    - **Screenshots/Images**: Attach relevant screenshots or images that help in understanding the issue. Please add or
+      link to images here.
+    - **Environment Information**:
+        - Operating System Version
+        - Browser/Application Version
+        - Other relevant environment details
+
+## License
 
 QIDISlicer is licensed under the _GNU Affero General Public License, version 3_. QIDISlicer is based on PrusaSlicer by PrusaResearch.
 

build_win.bat

@@ -235,7 +235,7 @@ FOR /F "tokens=2 delims=," %%I in (
 ) do SET PS_PROJECT_IS_OPEN=%%~I
 cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST%
 IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" (
-    (del CMakeCache.txt && cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST%) || GOTO :END
+    (del CMakeCache.txt && cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST% -DQDT_RELEASE_TO_PUBLIC=1) || GOTO :END
 ) ELSE GOTO :END
 REM Skip the build step if we're using the undocumented app-cmake to regenerate the full config from inside devenv
 IF "%PS_STEPS%" NEQ "app-cmake" msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG% /v:quiet %PS_PRIORITY% || GOTO :END

bundled_deps/CMakeLists.txt

@@ -0,0 +1,49 @@
+add_subdirectory(admesh)
+add_subdirectory(avrdude)
+add_subdirectory(miniz)
+add_subdirectory(glu-libtess)
+add_subdirectory(agg)
+add_subdirectory(libigl)
+add_subdirectory(hints)
+add_subdirectory(libnest2d)
+
+add_library(semver STATIC
+    semver/semver.c
+    semver/semver.h
+)
+target_include_directories(semver PUBLIC semver)
+encoding_check(semver)
+
+add_library(qoi STATIC
+    qoi/qoilib.c
+    qoi/qoi.h
+)
+target_include_directories(qoi PUBLIC qoi)
+encoding_check(qoi)
+
+add_library(fastfloat INTERFACE)
+target_include_directories(fastfloat INTERFACE fast_float)
+
+add_library(int128 INTERFACE)
+target_include_directories(int128 INTERFACE int128)
+
+add_library(localesutils STATIC
+    localesutils/LocalesUtils.cpp
+    localesutils/LocalesUtils.hpp
+)
+target_include_directories(localesutils PUBLIC localesutils)
+target_link_libraries(localesutils PRIVATE fastfloat)
+
+add_library(ankerl INTERFACE)
+target_include_directories(ankerl INTERFACE ankerl)
+
+add_library(stb_dxt INTERFACE)
+target_include_directories(stb_dxt INTERFACE stb_dxt)
+
+add_library(tcbspan INTERFACE)
+target_include_directories(tcbspan INTERFACE tcbspan)
+
+if (SLIC3R_GUI)
+    add_subdirectory(imgui)
+    add_subdirectory(hidapi)
+endif ()

bundled_deps/admesh/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(admesh)
+
+add_library(admesh STATIC
+    admesh/connect.cpp
+    admesh/normals.cpp
+    admesh/shared.cpp
+    admesh/stl.h
+    admesh/stl_io.cpp
+    admesh/stlinit.cpp
+    admesh/util.cpp
+)
+
+target_include_directories(admesh PUBLIC .)
+target_link_libraries(admesh PRIVATE boost_headeronly localesutils)
+target_link_libraries(admesh PUBLIC Eigen3::Eigen)

bundled_deps/admesh/admesh/normals.cpp

@@ -114,7 +114,7 @@ static bool check_normal_vector(stl_file *stl, int facet_num, int normal_fix_fla
 
 void stl_fix_normal_directions(stl_file *stl)
 {
- 	// This may happen for malformed models, see: https://github.com/qidi3d/QIDISlicer/issues/2209
+ 	// This may happen for malformed models, see: https://github.com/QIDITECH/QIDISlicer/issues/2209
   	if (stl->stats.number_of_facets == 0)
   		return;
 

bundled_deps/admesh/admesh/shared.cpp

@@ -30,7 +30,7 @@
 
 #include "stl.h"
 
-#include "libslic3r/LocalesUtils.hpp"
+#include <LocalesUtils.hpp>
 
 void stl_generate_shared_vertices(stl_file *stl, indexed_triangle_set &its)
 {

bundled_deps/admesh/admesh/stlinit.cpp

@@ -32,7 +32,7 @@
 
 #include "stl.h"
 
-#include "libslic3r/LocalesUtils.hpp"
+#include <LocalesUtils.hpp>
 
 #ifndef SEEK_SET
 #error "SEEK_SET not defined"

bundled_deps/agg/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.13)
+project(agg)
+
+add_library(agg INTERFACE)
+target_include_directories(agg INTERFACE .)

bundled_deps/avrdude/CMakeLists.txt

@@ -0,0 +1,107 @@
+cmake_minimum_required(VERSION 3.0)
+
+add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)   # To enable various useful macros and functions on Unices
+remove_definitions(-D_UNICODE -DUNICODE)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    # Workaround for an old CMake, which does not understand CMAKE_C_STANDARD.
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
+endif()
+
+
+set(AVRDUDE_SOURCES
+    avrdude/arduino.c
+    avrdude/avr.c
+    # avrdude/avrftdi.c
+    # avrdude/avrftdi_tpi.c
+    avrdude/avrpart.c
+    avrdude/avr910.c
+    avrdude/bitbang.c
+    avrdude/buspirate.c
+    avrdude/butterfly.c
+    avrdude/config.c
+    avrdude/config_gram.c
+    # avrdude/confwin.c
+    avrdude/crc16.c
+    # avrdude/dfu.c
+    avrdude/fileio.c
+    # avrdude/flip1.c
+    # avrdude/flip2.c
+    # avrdude/ft245r.c
+    # avrdude/jtagmkI.c
+    # avrdude/jtagmkII.c
+    # avrdude/jtag3.c
+    avrdude/lexer.c
+    avrdude/linuxgpio.c
+    avrdude/lists.c
+    # avrdude/par.c
+    avrdude/pgm.c
+    avrdude/pgm_type.c
+    avrdude/pickit2.c
+    avrdude/pindefs.c
+    # avrdude/ppi.c
+    # avrdude/ppiwin.c
+    avrdude/safemode.c
+    avrdude/ser_avrdoper.c
+    avrdude/serbb_posix.c
+    avrdude/serbb_win32.c
+    avrdude/ser_posix.c
+    avrdude/ser_win32.c
+    avrdude/stk500.c
+    avrdude/stk500generic.c
+    avrdude/stk500v2.c
+    avrdude/term.c
+    avrdude/update.c
+    # avrdude/usbasp.c
+    # avrdude/usb_hidapi.c
+    # avrdude/usb_libusb.c
+    # avrdude/usbtiny.c
+    avrdude/wiring.c
+
+    avrdude/main.c
+    avrdude/avrdude-slic3r.hpp
+    avrdude/avrdude-slic3r.cpp
+)
+if (MSVC)
+    set(AVRDUDE_SOURCES ${AVRDUDE_SOURCES}
+        avrdude/windows/utf8.c
+        avrdude/windows/unistd.cpp
+        avrdude/windows/getopt.c
+    )
+elseif (MINGW)
+    set(AVRDUDE_SOURCES ${AVRDUDE_SOURCES}
+        avrdude/windows/utf8.c
+    )
+endif()
+
+include(bin2h)
+
+bin2h(
+    SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/avrdude/avrdude-slic3r.conf
+    VARIABLE_NAME avrdude_slic3r_conf
+    HEADER_FILE ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
+    ADD_WARNING_TEXT
+)
+
+add_library(avrdude STATIC ${AVRDUDE_SOURCES})
+target_link_libraries(avrdude PRIVATE localesutils)
+
+add_executable(avrdude-slic3r avrdude/main-standalone.cpp)
+target_link_libraries(avrdude-slic3r avrdude)
+
+encoding_check(avrdude)
+encoding_check(avrdude-slic3r)
+
+# Make avrdude-slic3r.conf.h includable:
+target_include_directories(avrdude SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(avrdude PUBLIC .)
+
+if (WIN32)
+    target_compile_definitions(avrdude PRIVATE WIN32NATIVE=1)
+    if(MSVC)
+        target_include_directories(avrdude SYSTEM PRIVATE avrdude/windows)    # So that sources find the getopt.h windows drop-in
+    endif(MSVC)
+endif()

bundled_deps/avrdude/avrdude/ac_cfg.h

@@ -172,7 +172,7 @@
 #define PACKAGE "avrdude-slic3r"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://github.com/prusa3d/QIDISlicer/issues"
+#define PACKAGE_BUGREPORT "https://github.com/QIDITECH/QIDISlicer/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "avrdude-slic3r"
@@ -184,7 +184,7 @@
 #define PACKAGE_TARNAME "avrdude-slic3r"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL "https://github.com/prusa3d/QIDISlicer"
+#define PACKAGE_URL "https://github.com/QIDITECH/QIDISlicer"
 
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "6.3-20160220"