Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-06 07:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.6.0

Browse Source 
# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeom.h
This commit is contained in:
Thomas Krijnen
2018-09-07 14:42:15 +02:00
parent 0df4edff01 229a708fc3
commit 54d96fe167
12 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/build-deps.cmd
+1 -1
View File
@@ -145,7 +145,7 @@ echo.
cd "%DEPS_DIR%"
:: Note all of the depedencies have approriate label so that user can easily skip something if wanted
:: Note all of the dependencies have appropriate label so that user can easily skip something if wanted
:: by modifying this file and using goto.
:Boost
:: NOTE Boost < 1.64 doesn't work without tricks if the user has only VS 2017 installed and no earlier versions.
win/readme.md
+2 -2
View File
@@ -15,7 +15,7 @@ Usage Instructions
Building using MSYS is very similar to using the MSVC batch files, but instead the shell scripts
are used. Note that the MSYS support is currently a bit experimental. It is advised to check out the contents
of the shell scripts before using them. Note that contrary to MSVC, with MSYS all of the dependencies are not
built or used as static libaries. Currently Release build is used for all libraries.
built or used as static libraries. Currently Release build is used for all libraries.
### MSVC
Execute `build-deps.cmd` to fetch, build and install the dependencies. The batch file will print the requirements for
@@ -28,7 +28,7 @@ deduced from the MSVC environment variables. User-friendly VS generator shorthan
`vs2013-x86` or `vs2015-x64`, and these are converted to the appropriate CMake ones by the scripts. A build type
(`Build`, `Rebuild`, or `Clean`, defaults to `Build`) can be provided as `%3`. See `vs-cfg.cmd` if you wish to change
the defaults. The batch file will create `deps\` and `deps-vs<VERSION>-<ARCHITECTURE>-installed\` directories to the
project root. Debug and release builds of the depedencies can co-exist by simply running
project root. Debug and release builds of the dependencies can co-exist by simply running
```
> build-deps.cmd <GENERATOR> Debug
> build-deps.cmd <GENERATOR> <Release|RelWithDebInfo|MinSizeRel>