pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avrdude: Fix string encoding handling on Windows

Browse Source
This commit is contained in:
Vojtech Kral
2019-02-27 11:53:09 +01:00
parent c426c99af0
commit bc1aaaa146
8 changed files with 206 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/avrdude/CMakeLists.txt
View File

@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.0)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) # To enable various useful macros and functions on Unices
remove_definitions(-D_UNICODE -DUNICODE)
@@ -68,6 +70,7 @@ set(AVRDUDE_SOURCES
)
if (MSVC)
set(AVRDUDE_SOURCES ${AVRDUDE_SOURCES}
windows/utf8.c
windows/unistd.cpp
windows/getopt.c
)
@@ -90,7 +93,7 @@ add_custom_target(gen_conf_h
add_library(avrdude STATIC ${AVRDUDE_SOURCES})
add_dependencies(avrdude gen_conf_h)
add_executable(avrdude-slic3r main-standalone.c)
add_executable(avrdude-slic3r main-standalone.cpp)
target_link_libraries(avrdude-slic3r avrdude)
if (WIN32)