1
0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00

add ifdef to pinproctest.h for WIN32 to use local yaml.h. Adjust notes in markdown.

This commit is contained in:
gstellenberg
2009-10-31 00:28:13 -05:00
parent c7367fc5ee
commit 25471bc59d
2 changed files with 8 additions and 4 deletions

View File

@@ -51,10 +51,10 @@ Follow directions above for building yaml-cpp with the following exception:
add '-G "MinGW Makefiles"' to the cmake command line. add '-G "MinGW Makefiles"' to the cmake command line.
To build libpinproc: 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: - 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.
change libpinproc/examples/pinproctest/pinproctest.h to look for yaml.h locally: "yaml.h"
- 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: Follow instructions above for building libpinproc with cmake with the following exceptions:
add '-G "MinGW Makefiles' to the cmake command line, add '-G "MinGW Makefiles' to the cmake command line,

View File

@@ -34,7 +34,11 @@
#include <cmath> #include <cmath>
#include "../../include/pinproc.h" // Include libpinproc's header. #include "../../include/pinproc.h" // Include libpinproc's header.
#include <fstream> #include <fstream>
#include <yaml-cpp/yaml.h> #if defined(__WIN32__)
#include "yaml.h"
#else
#include <yaml-cpp/yaml.h>
#endif
#include <sys/time.h> #include <sys/time.h>
#define kFlippersSection "PRFlippers" #define kFlippersSection "PRFlippers"