From 183ed562c6d37e6e7056df70f67ede66120c291e Mon Sep 17 00:00:00 2001 From: Gregor Haas Date: Sat, 7 Dec 2019 15:29:36 -0500 Subject: [PATCH] Move config file --- CMakeLists.txt | 2 +- checkm8_conf.h | 6 ++++++ checkm8_remote/include/conf.h | 6 ------ libusb/config.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 checkm8_conf.h delete mode 100644 checkm8_remote/include/conf.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ce1e8c..d31b7f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ enable_language(C) include_directories(libusb/src/) add_library(checkm8_libusb - checkm8_remote/include/conf.h libusb/config.h + checkm8_conf.h libusb/config.h libusb/src/core.c libusb/src/descriptor.c libusb/src/hotplug.c libusb/src/io.c libusb/src/strerror.c libusb/src/sync.c diff --git a/checkm8_conf.h b/checkm8_conf.h new file mode 100644 index 0000000..ef2f01c --- /dev/null +++ b/checkm8_conf.h @@ -0,0 +1,6 @@ +#ifndef IPWNDFU_REWRITE_C_CHECKM8_CONF_H +#define IPWNDFU_REWRITE_C_CHECKM8_CONF_H + +//#define LIBUSB_LOGGING + +#endif //IPWNDFU_REWRITE_C_CHECKM8_CONF_H diff --git a/checkm8_remote/include/conf.h b/checkm8_remote/include/conf.h deleted file mode 100644 index f7c4425..0000000 --- a/checkm8_remote/include/conf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef IPWNDFU_REWRITE_C_CONF_H -#define IPWNDFU_REWRITE_C_CONF_H - -//#define LIBUSB_LOGGING - -#endif //IPWNDFU_REWRITE_C_CONF_H diff --git a/libusb/config.h b/libusb/config.h index d441d84..6b8da64 100644 --- a/libusb/config.h +++ b/libusb/config.h @@ -1,7 +1,7 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -#include "../checkm8_remote/include/conf.h" +#include "../checkm8_conf.h" /* Default visibility */ #define DEFAULT_VISIBILITY __attribute__((visibility("default")))