From 90ac50f210e3d5c287340421c9fb2660a17e2bd2 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 21 May 2019 12:53:54 +0200 Subject: [PATCH 1/2] Document libffi dependency in nix build script for installing py37 --- nix/build-all.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 5844f44e2b..4fdfba5f8a 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -28,16 +28,19 @@ # if building with USE_OCCT additionally: # # * freetype * glx.h # # # +# For python37 to install correctly additionally: # +# * libffi(-dev[el]) # +# # # on debian 7.8 these can be obtained with: # # $ apt-get install git gcc g++ autoconf bison bzip2 # -# libfreetype6-dev mesa-common-dev # +# libfreetype6-dev mesa-common-dev libffi-dev # # # # on ubuntu 14.04: # # $ apt-get install git gcc g++ autoconf bison make # -# libfreetype6-dev mesa-common-dev # +# libfreetype6-dev mesa-common-dev libffi-dev # # # # on OS X El Capitan with homebrew: # -# $ brew install git bison autoconf automake freetype # +# $ brew install git bison autoconf automake freetype libffi # # # ############################################################################### From c61bc29f0646430c207050ed5b62a6a216628159 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Tue, 21 May 2019 12:03:44 +0100 Subject: [PATCH 2/2] Relocate random header include --- src/ifcconvert/IfcConvert.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp index e9a8780469..4fd315261d 100644 --- a/src/ifcconvert/IfcConvert.cpp +++ b/src/ifcconvert/IfcConvert.cpp @@ -56,9 +56,9 @@ #ifdef _MSC_VER #include #include +#endif // C++11 header: #include -#endif #if defined(_MSC_VER) && defined(_UNICODE) typedef std::wstring path_t;