From 6782a7bfd4b8467e05493c6e17b3a6d830bf770a Mon Sep 17 00:00:00 2001 From: Jakub Stefanski Date: Fri, 2 Oct 2015 13:57:51 +0200 Subject: [PATCH] Fix Windows build Fixed windef.h shadowing of 'max' definition and added LEAN_AND_MEAN definition for more lightweight build. Added missing 'functional' includes. --- CMakeLists.txt | 6 +++++- amqpcpp.h | 1 + src/includes.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a3f1a7..1cc7a1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,4 +36,8 @@ if(BUILD_TUTORIALS) endif() set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) -set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE) \ No newline at end of file +set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE) + +if (WIN32) + add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) +endif() diff --git a/amqpcpp.h b/amqpcpp.h index b267dff..80d0626 100644 --- a/amqpcpp.h +++ b/amqpcpp.h @@ -22,6 +22,7 @@ #include #include #include +#include // base C include files #include diff --git a/src/includes.h b/src/includes.h index 866eaba..c3e5468 100644 --- a/src/includes.h +++ b/src/includes.h @@ -21,6 +21,7 @@ #include #include #include +#include // forward declarations #include "../include/classes.h"