Skip to content

Commit 033caf3

Browse files
committed
update patch after code changed upstream avrdudes/avrdude@8b61c9d and avrdudes/avrdude@053c2dc
1 parent 7295e15 commit 033caf3

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,22 @@
1-
From 8886e3dce286f807bd6c0f93683cad0c5a16a283 Mon Sep 17 00:00:00 2001
2-
From: Umberto Baldi <[email protected]>
3-
Date: Thu, 5 May 2022 15:12:46 +0200
4-
Subject: [PATCH] CMake fix build not working with mingw toolchain
5-
6-
---
7-
src/CMakeLists.txt | 6 +++---
8-
1 file changed, 3 insertions(+), 3 deletions(-)
9-
101
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
11-
index 9eae65e..94ef468 100644
2+
index ca6cb64..2ccf4af 100644
123
--- a/src/CMakeLists.txt
134
+++ b/src/CMakeLists.txt
14-
@@ -50,12 +50,12 @@ endif()
5+
@@ -50,7 +50,7 @@ endif()
156
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
167
add_compile_definitions(CONFIG_DIR=\"${CONFIG_DIR}\")
178

189
-if(WIN32)
19-
+if(MINGW)
20-
set(EXTRA_WINDOWS_SOURCES "${PROJECT_BINARY_DIR}/src/windows.rc")
10+
+if(WIN32 OR MINGW)
11+
set(EXTRA_WINDOWS_RESOURCES "${PROJECT_BINARY_DIR}/src/windows.rc")
2112
set(EXTRA_WINDOWS_LIBRARIES setupapi ws2_32)
2213
endif()
14+
@@ -108,7 +108,7 @@ endif()
2315

24-
-if(NOT WIN32)
25-
+if(NOT MINGW)
26-
set(LIB_MATH m)
27-
add_compile_options(-Wall) # -Wextra
28-
endif()
29-
@@ -102,7 +102,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/avrdude.conf.in" "${conf_file}")
3016
configure_file(cmake_config.h.in ac_cfg.h)
31-
configure_file("${PROJECT_BINARY_DIR}/avrdude.conf.in" avrdude.conf)
3217
configure_file(avrdude.spec.in avrdude.spec)
3318
-if(WIN32)
34-
+if(MINGW)
19+
+if(WIN32 OR MINGW)
3520
configure_file(windows.rc.in windows.rc)
3621
endif()
3722

38-
--
39-
2.17.1
40-

0 commit comments

Comments
 (0)