From 25471bc59d59db18ee3e0817ee25187fe10fd577 Mon Sep 17 00:00:00 2001 From: gstellenberg Date: Sat, 31 Oct 2009 00:28:13 -0500 Subject: [PATCH] add ifdef to pinproctest.h for WIN32 to use local yaml.h. Adjust notes in markdown. --- README.markdown | 6 +++--- examples/pinproctest/pinproctest.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index 6a6be39..6afb42b 100644 --- a/README.markdown +++ b/README.markdown @@ -51,10 +51,10 @@ Follow directions above for building yaml-cpp with the following exception: add '-G "MinGW Makefiles"' to the cmake command line. To build libpinproc: - add the paths for ftd2xx.h (from the unzipped driver package) and the yaml-cpp/include/*.h files to the "include_directories" line in libpinproc/CMakeLists.txt -Until an automatic build process/structure is worked out: - change libpinproc/examples/pinproctest/pinproctest.h to look for yaml.h locally: "yaml.h" +- add the paths for ftd2xx.h (from the unzipped driver package) and the yaml-cpp/include/*.h files to the "include_directories" line in libpinproc/CMakeLists.txt. + +- either create the directory c:\usr\local\lib and copy libyaml-cpp*.a from the yaml-cpp build directory and ftd2xx.sys to it or add the location of those files to the "link_directories" line in libpinproc/CMakeLists.txt. Follow instructions above for building libpinproc with cmake with the following exceptions: add '-G "MinGW Makefiles' to the cmake command line, diff --git a/examples/pinproctest/pinproctest.h b/examples/pinproctest/pinproctest.h index edd42ba..bf8c0dc 100644 --- a/examples/pinproctest/pinproctest.h +++ b/examples/pinproctest/pinproctest.h @@ -34,7 +34,11 @@ #include #include "../../include/pinproc.h" // Include libpinproc's header. #include -#include +#if defined(__WIN32__) + #include "yaml.h" +#else + #include +#endif #include #define kFlippersSection "PRFlippers"