Skip to content

Commit d3b3de9

Browse files
committed
Updated deps scripts with new embree version
1 parent 90858be commit d3b3de9

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

README.txt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@ paste it in the command prompt via right click -> paste)
2626
The first run of the build process will take around 20 minutes
2727
(depending on your CPU) and the linking process may consume a lot of RAM.
2828

29-
Default build will use Python 3.5, the version embedded in Blender 2.79b.
30-
You can add an option to specify the version of your choice among 3.5, 3.6, 3.7, e.g.:
31-
.\cmake-build-x64.bat /python36
32-
3329
The compiled binaries are in Build_CMake\LuxCore\bin\Release\
3430
The pyluxcore.pyd binary is in Build_CMake\LuxCore\lib\Release
3531
You can run the script collect-compiled-binaries.bat to collect them.
3632

37-
In order to create an official release, you need also to install Python v3.5, PyInstaller
38-
(with a "pip install pyinstaller") and PySide
39-
(download from https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyside the version for Python 3.5).
33+
In order to create an official release, you need also to install the following:
34+
- Python v3.5
35+
- PyInstaller (with a "pip install pyinstaller")
36+
- PySide (download from https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyside the version for Python 3.5)
37+
- NumPy (with a "pip install numpy==1.12.1")
4038
You can then pack the archive with the create-standalone.bat or create-sdk.bat.
41-
Note that the create-standalone.bat assumes that you have 7zip installed in this path:
42-
"C:\Program Files\7-Zip\7z.exe"
43-
If that is not the case, the pyluxcoretools.zip will not be created.
39+
40+
Note: default build will use Python 3.5, the version embedded in Blender 2.79b.
41+
You can add an option to specify the version of your choice among 3.5, 3.6, 3.7, e.g.:
42+
.\cmake-build-x64.bat /python36
43+
44+
Note: normally you never need to build dependencies in order to build LuxCore,
45+
just use the WindowsCompileDeps repo as explained above.
46+
The getdeps.bat and build-deps-x64.bat scripts are used mainly as a reference
47+
for developers and are not guaranteed to be always up-to-date.

build-deps-x64.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,13 @@ echo **************************************************************************
546546
cd /d %LUX_X64_EMBREE_ROOT%
547547

548548
rem Not necessary to build embree, we copy files from binary distribution
549-
CALL:copyFile bin\embree.dll %LIB_DIR%\embree.dll
549+
CALL:copyFile bin\embree3.dll %LIB_DIR%\embree3.dll
550550
CALL:copyFile bin\tbb.dll %LIB_DIR%\tbb.dll
551551
CALL:copyFile bin\tbbmalloc.dll %LIB_DIR%\tbbmalloc.dll
552552
CALL:copyFile lib\*.lib %LIB_DIR%
553553

554-
mkdir %INCLUDE_DIR%\embree2
555-
CALL:copyFile include\embree2\*.* %INCLUDE_DIR%\embree2
554+
mkdir %INCLUDE_DIR%\embree3
555+
CALL:copyFile include\embree3\*.* %INCLUDE_DIR%\embree3
556556

557557

558558
:: ****************************************************************************

getdeps.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SET FREEIMAGE_VER_N=3160
1010
SET BLOSC_VER=1.14.3
1111
SET BZIP2_VER=1.0.6
1212
SET CMAKE_VER=2.8.12.2
13-
SET EMBREE_VER=2.17.1
13+
SET EMBREE_VER=3.2.4
1414
SET ILMBASE_VER=2.2.0
1515
SET JPEG_VER=9a
1616
SET LIBPNG_VER=1.6.12
@@ -181,9 +181,9 @@ CALL:extractFile "bzip2 %BZIP2_VER%", "%DOWNLOADS%\bzip2-%BZIP2_VER%.tar.gz"
181181
CALL:addBuildPathVar "LUX_X64_BZIP_ROOT", "%D64%\bzip2-%BZIP2_VER%"
182182

183183
:embree
184-
CALL:downloadFile "embree %EMBREE_VER%", "https://github.com/embree/embree/releases/download/v%EMBREE_VER%/embree-%EMBREE_VER%.x64.windows.zip", "embree-%EMBREE_VER%.zip" || EXIT /b -1
184+
CALL:downloadFile "embree %EMBREE_VER%", "https://github.com/embree/embree/releases/download/v%EMBREE_VER%/embree-%EMBREE_VER%.x64.vc14.windows.zip", "embree-%EMBREE_VER%.zip" || EXIT /b -1
185185
CALL:extractFile "embree %EMBREE_VER%", "%DOWNLOADS%\embree-%EMBREE_VER%.zip"
186-
ren %D64%\embree-%EMBREE_VER%.x64.windows embree-%EMBREE_VER%
186+
ren %D64%\embree-%EMBREE_VER%.x64.vc14.windows embree-%EMBREE_VER%
187187

188188
CALL:addBuildPathVar "LUX_X64_EMBREE_ROOT", "%D64%\embree-%EMBREE_VER%"
189189

0 commit comments

Comments
 (0)