Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-27 02:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.6.0

Browse Source 
# Conflicts:
#	nix/build-all.py
This commit is contained in:
Thomas Krijnen
2019-05-21 13:30:58 +02:00
parent 4e21298009 c61bc29f06
commit 21981403c7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+6 -3
View File
@@ -31,16 +31,19 @@
# if building with -shared # # if building with -shared #
# * libgl1-mesa-dev libxext-dev libxmu-dev libxmu-headers libxi-dev # # * libgl1-mesa-dev libxext-dev libxmu-dev libxmu-headers libxi-dev #
# # # #
# for python37 to install correctly additionally: #
# * libffi(-dev[el]) #
# #
# on debian 7.8 these can be obtained with: # # on debian 7.8 these can be obtained with: #
# $ apt-get install git gcc g++ autoconf bison bzip2 # # $ 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: # # on ubuntu 14.04: #
# $ apt-get install git gcc g++ autoconf bison make # # $ 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: # # on OS X El Capitan with homebrew: #
# $ brew install git bison autoconf automake freetype # # $ brew install git bison autoconf automake freetype libffi #
# # # #
############################################################################### ###############################################################################
src/ifcconvert/IfcConvert.cpp
+1 -1
View File
@@ -61,9 +61,9 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#endif
// C++11 header: // C++11 header:
#include <random> #include <random>
#endif
#if defined(_MSC_VER) && defined(_UNICODE) #if defined(_MSC_VER) && defined(_UNICODE)
typedef std::wstring path_t; typedef std::wstring path_t;