Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortamasmeszaros <meszaros.q@gmail.com>2019-08-16 17:17:37 +0300
committertamasmeszaros <meszaros.q@gmail.com>2019-08-16 17:17:37 +0300
commit7e0199746ef683c2bda80c5649b5c4150880a9c3 (patch)
tree68e994c183521fa7248a332f574995b7ac0e773b /src/avrdude
parent7d25d8c677cc0edbba469e2a54658ed9468efa60 (diff)
more clang warnings enabled, performance measuring
Succesfull build on mingw-w64 fix sandboxes Mingw fixes and full parallel support tree gen.
Diffstat (limited to 'src/avrdude')
-rw-r--r--src/avrdude/CMakeLists.txt8
-rw-r--r--src/avrdude/lexer.c2
-rw-r--r--src/avrdude/main-standalone.cpp4
-rw-r--r--src/avrdude/windows/unistd.h2
4 files changed, 13 insertions, 3 deletions
diff --git a/src/avrdude/CMakeLists.txt b/src/avrdude/CMakeLists.txt
index 0e9b9e6d4..a1930ad5f 100644
--- a/src/avrdude/CMakeLists.txt
+++ b/src/avrdude/CMakeLists.txt
@@ -74,6 +74,10 @@ if (MSVC)
windows/unistd.cpp
windows/getopt.c
)
+elseif (MINGW)
+ set(AVRDUDE_SOURCES ${AVRDUDE_SOURCES}
+ windows/utf8.c
+ )
endif()
add_executable(avrdude-conf-gen conf-generate.cpp)
@@ -98,5 +102,7 @@ target_link_libraries(avrdude-slic3r avrdude)
if (WIN32)
target_compile_definitions(avrdude PRIVATE WIN32NATIVE=1)
- target_include_directories(avrdude SYSTEM PRIVATE windows) # So that sources find the getopt.h windows drop-in
+ if(MSVC)
+ target_include_directories(avrdude SYSTEM PRIVATE windows) # So that sources find the getopt.h windows drop-in
+ endif(MSVC)
endif()
diff --git a/src/avrdude/lexer.c b/src/avrdude/lexer.c
index f2d8adb4b..46d88170f 100644
--- a/src/avrdude/lexer.c
+++ b/src/avrdude/lexer.c
@@ -30,7 +30,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(_MSC_VER)
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
diff --git a/src/avrdude/main-standalone.cpp b/src/avrdude/main-standalone.cpp
index df6d79e13..f7cd6d1d4 100644
--- a/src/avrdude/main-standalone.cpp
+++ b/src/avrdude/main-standalone.cpp
@@ -38,6 +38,10 @@ struct ArgvUtf8 : std::vector<char*>
}
};
+#endif
+
+#ifdef _MSC_VER
+
int wmain(int argc_w, wchar_t *argv_w[])
{
ArgvUtf8 argv_utf8(argc_w, argv_w);
diff --git a/src/avrdude/windows/unistd.h b/src/avrdude/windows/unistd.h
index fe6a8fb87..c88b780bf 100644
--- a/src/avrdude/windows/unistd.h
+++ b/src/avrdude/windows/unistd.h
@@ -63,7 +63,7 @@ extern "C" {
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && defined(__clang__)
#include <stdint.h>
struct timezone;
struct timeval;