From 53e72a944ab65de7555428515540e68de4e327ea Mon Sep 17 00:00:00 2001 From: Greg Davill Date: Sun, 23 Oct 2022 18:52:47 +1030 Subject: [PATCH] pathHelper: Only compile on win builds --- CMakeLists.txt | 5 +++-- src/altera.cpp | 4 +++- src/xilinx.cpp | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e591800..4749127 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,6 @@ set(OPENFPGALOADER_SOURCE src/jlink.cpp src/lattice.cpp src/progressBar.cpp - src/pathHelper.cpp src/fsparser.cpp src/mcsParser.cpp src/ftdispi.cpp @@ -139,7 +138,6 @@ set(OPENFPGALOADER_HEADERS src/ice40.hpp src/ihexParser.hpp src/progressBar.hpp - src/pathHelper.hpp src/rawParser.hpp src/usbBlaster.hpp src/bitparser.hpp @@ -198,6 +196,9 @@ target_link_libraries(openFPGALoader if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") # winsock provides ntohs target_link_libraries(openFPGALoader ws2_32) + + target_sources(openFPGALoader PRIVATE src/pathHelper.cpp) + list(APPEND OPENFPGALOADER_HEADERS src/pathHelper.hpp) endif() # libusb_attach_kernel_driver is only available on Linux. diff --git a/src/altera.cpp b/src/altera.cpp index b9493ff..fdef8c3 100644 --- a/src/altera.cpp +++ b/src/altera.cpp @@ -13,8 +13,10 @@ #include "device.hpp" #include "epcq.hpp" #include "progressBar.hpp" -#include "pathHelper.hpp" #include "rawParser.hpp" +#if defined (_WIN64) || defined (_WIN32) +#include "pathHelper.hpp" +#endif #define IDCODE 6 #define USER0 0x0C diff --git a/src/xilinx.cpp b/src/xilinx.cpp index 4b5f01b..e67f53f 100644 --- a/src/xilinx.cpp +++ b/src/xilinx.cpp @@ -24,7 +24,9 @@ #include "xilinxMapParser.hpp" #include "part.hpp" #include "progressBar.hpp" +#if defined (_WIN64) || defined (_WIN32) #include "pathHelper.hpp" +#endif Xilinx::Xilinx(Jtag *jtag, const std::string &filename, const std::string &file_type,