Skip to content

Commit 7ce2139

Browse files
u3drealu3dreal
authored
Merge pull request #578 from u3dreal/master
update azure to macos-11 (11.0)
2 parents 6ecf401 + 5e39fcd commit 7ce2139

File tree

6 files changed

+102
-99
lines changed

6 files changed

+102
-99
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
condition: succeeded()
156156
timeoutInMinutes: 0
157157
pool:
158-
vmImage: 'macOS-10.14'
158+
vmImage: 'macOS-11'
159159
variables:
160160
version_string: $[ dependencies.DetectBuildType.outputs['setvarStep.version_string'] ]
161161

‎cmake/PlatformSpecific.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ IF(APPLE)
163163

164164
EXECUTE_PROCESS(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
165165

166-
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) # Minimum OS requirements for LuxCore
166+
SET(CMAKE_OSX_DEPLOYMENT_TARGET 11.0) # Minimum OS requirements for LuxCore
167167

168168
IF(${MAC_SYS} MATCHES 20)
169-
SET(OSX_SYSTEM 11.3)
169+
SET(OSX_SYSTEM 12.0)
170170
ELSEIF(${MAC_SYS} MATCHES 19)
171171
SET(OSX_SYSTEM 10.15)
172172
ELSEIF(${MAC_SYS} MATCHES 18)
@@ -192,7 +192,7 @@ IF(APPLE)
192192

193193
SET(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT, gets latest available
194194

195-
# set a precedence of sdk path over all other default search paths
195+
# set a precedence of sdk path over all other default search pathes
196196
SET(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})
197197

198198
### options

‎cmake/SpecializedConfig/Config_OSX.cmake‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###########################################################################
22
#
3-
# Configuration ( Jens Verwiebe )
3+
# Configuration ( Jens Verwiebe, Gregor Quade )
44
#
55
###########################################################################
66

@@ -15,7 +15,11 @@ MESSAGE(STATUS "OSX_DEPENDENCY_ROOT : " ${OSX_DEPENDENCY_ROOT})
1515
set(OSX_SEARCH_PATH ${OSX_DEPENDENCY_ROOT})
1616

1717
# Libs present in system ( /usr )
18-
SET(SYS_LIBRARIES z )
18+
#SET(SYS_LIBRARIES z )
19+
20+
SET(SYS_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libz.a )
21+
22+
1923

2024
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())" OUTPUT_VARIABLE PY3_INCLUDE)
2125
execute_process(COMMAND python3 -c "import distutils.sysconfig as sysconfig; print(sysconfig.get_config_var('LIBDIR'))" OUTPUT_VARIABLE PY3_LIB)
@@ -59,17 +63,15 @@ set(TBB_INCLUDE_PATH "${OSX_SEARCH_PATH}/include")
5963
set(BLOSC_SEARCH_PATH "${OSX_SEARCH_PATH}")
6064
set(BLOSC_INCLUDE_PATH "${OSX_SEARCH_PATH}/include")
6165

62-
find_library(OPENMP_LIB libiomp5.dylib HINTS ${OSX_SEARCH_PATH}/lib)
66+
find_library(OPENMP_LIB libomp.a HINTS ${OSX_SEARCH_PATH}/lib)
6367

6468
if(NOT OPENMP_LIB)
6569
message(FATAL_ERROR "OpenMP library not found")
6670
else()
67-
set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${OSX_SEARCH_PATH}/include")
71+
set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I${OSX_SEARCH_PATH}/include")
6872
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${OpenMP_CXX_FLAGS}")
69-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -liomp5")
70-
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -liomp5")
71-
#INSTALL(FILES ${OSX_SEARCH_PATH}/lib/libomp.dylib DESTINATION lib)
72-
#INSTALL(FILES ${OSX_SEARCH_PATH}/lib/libiomp5.dylib DESTINATION lib)
73+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -lomp")
74+
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -lomp")
7375
set(OPENMP_FOUND 1)
7476
MESSAGE(STATUS "OpenMP found")
7577
endif()
@@ -79,31 +81,32 @@ find_path(GLEW_INCLUDE_DIR glew.h PATHS ${OSX_SEARCH_PATH}/include/GL )
7981
find_library(GLEW_LIBRARY libGLEW.a PATHS ${OSX_SEARCH_PATH}/lib )
8082
set(GLEW_FOUND 1)
8183

82-
set(GLUT_SEARCH_PATH "${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/glut.framework")
84+
set(GLUT_SEARCH_PATH "${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/glut.framework")
8385
set(GLUT_INCLUDE_PATH "${GLUT_SEARCH_PATH}/Headers")
8486

8587
SET(OPENEXR_ROOT "${OSX_SEARCH_PATH}")
8688

8789
# Libs with hardcoded paths ( macos repo )
88-
SET(TIFF_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libtiff.dylib ${OSX_DEPENDENCY_ROOT}/lib/liblzma.a)
90+
91+
SET(TIFF_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libtiff.a ${OSX_DEPENDENCY_ROOT}/lib/liblzma.a)
8992
SET(TIFF_INCLUDE_DIR ${OSX_DEPENDENCY_ROOT}/include/tiff)
9093
SET(TIFF_FOUND ON)
94+
9195
SET(JPEG_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libjpeg.a)
9296
SET(JPEG_INCLUDE_DIR ${OSX_DEPENDENCY_ROOT}/include/jpeg)
9397
SET(JPEG_FOUND ON)
94-
SET(PNG_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libpng.a ${SYS_LIBRARIES})
98+
99+
SET(PNG_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libpng.a ${OSX_DEPENDENCY_ROOT}/lib/libz.a)
95100
SET(PNG_INCLUDE_DIR ${OSX_DEPENDENCY_ROOT}/include/png)
96101
SET(PNG_FOUND ON)
97-
SET(EMBREE_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libembree3.dylib)
102+
103+
SET(EMBREE_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libembree3.dylib) # ${OSX_DEPENDENCY_ROOT}/lib/libsys.a ${OSX_DEPENDENCY_ROOT}/lib/libmath.a ${OSX_DEPENDENCY_ROOT}/lib/libsimd.a ${OSX_DEPENDENCY_ROOT}/lib/liblexers.a ${OSX_DEPENDENCY_ROOT}/lib/libtasking.a ${OSX_DEPENDENCY_ROOT}/lib/libembree_sse42.a ${OSX_DEPENDENCY_ROOT}/lib/libembree_avx.a ${OSX_DEPENDENCY_ROOT}/lib/libembree_avx2.a)
98104
SET(EMBREE_INCLUDE_PATH ${OSX_DEPENDENCY_ROOT}/include/embree3)
99105
SET(EMBREE_FOUND ON)
100-
#INSTALL(FILES ${OSX_DEPENDENCY_ROOT}/lib/libembree3.dylib DESTINATION lib)
101-
#INSTALL(FILES ${OSX_DEPENDENCY_ROOT}/lib/libembree3.3.dylib DESTINATION lib)
102106

103-
SET(OPENIMAGEIO_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageIO.dylib)
107+
SET(OPENIMAGEIO_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageIO.a)
104108
SET(OPENIMAGEIO_INCLUDE_PATH ${OSX_DEPENDENCY_ROOT}/include/OpenImageIO)
105109
SET(OPENIMAGEIO_FOUND ON)
106110

107-
SET(OIDN_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageDenoise.dylib)
111+
SET(OIDN_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageDenoise.a ${OSX_DEPENDENCY_ROOT}/lib/libdnnl.a ${OSX_DEPENDENCY_ROOT}/lib/libcommon.a )
108112
SET(OIDN_INCLUDE_PATH ${OSX_DEPENDENCY_ROOT}/include/OpenImageDenoise)
109-

‎scripts/azurepipeline/macos/build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
#Fetch BuildDeps
4-
wget https://github.com/LuxCoreRender/MacOSCompileDeps/releases/download/luxcorerender_v2.6alpha/MacDistFiles_39.tar.gz
5-
tar xzf MacDistFiles_39.tar.gz
4+
wget https://github.com/LuxCoreRender/MacOSCompileDeps/releases/download/luxcorerender_v2.6/MacDistFiles_39_static.tar.gz
5+
tar xzf MacDistFiles_39_static.tar.gz
66

77
# Set Environment Variables
88
export PATH="/usr/local/opt/bison/bin:/usr/local/bin:$PATH"
@@ -15,6 +15,6 @@ eval "$(pyenv init -)"
1515

1616
mkdir build
1717
pushd build
18-
cmake -DOSX_DEPENDENCY_ROOT=$DEPS_SOURCE -DCMAKE_BUILD_TYPE=Release ..
18+
cmake -DCMAKE_XCODE_BUILD_SYSTEM=1 -DOSX_DEPENDENCY_ROOT=$DEPS_SOURCE -DCMAKE_BUILD_TYPE=Release ..
1919
make
2020
popd

‎scripts/azurepipeline/macos/install.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ brew install freeimage
88

99
eval "$(pyenv init -)"
1010

11-
pyenv install 3.9.2
12-
pyenv global 3.9.2
13-
pyenv shell 3.9.2
11+
pyenv install 3.9.7
12+
pyenv global 3.9.7
13+
pyenv shell 3.9.7
1414

15-
sudo pip3 install -U numpy==1.19.5
15+
sudo pip3 install -U numpy==1.21.2
1616
sudo pip3 install pillow
1717
sudo pip3 install pyside2

‎scripts/azurepipeline/macos/pack.sh‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ cd release_OSX
1818

1919
mkdir -p LuxCore.app/Contents/Resources/libs/
2020

21-
#libomp
22-
23-
cp -f $DEPS_SOURCE/lib/libomp.dylib LuxCore.app/Contents/Resources/libs/libomp.dylib
24-
chmod +w LuxCore.app/Contents/Resources/libs/libomp.dylib
25-
install_name_tool -id @executable_path/../Resources/libs/libomp.dylib LuxCore.app/Contents/Resources/libs/libomp.dylib
21+
# #libomp
22+
#
23+
# cp -f $DEPS_SOURCE/lib/libomp.dylib LuxCore.app/Contents/Resources/libs/libomp.dylib
24+
# chmod +w LuxCore.app/Contents/Resources/libs/libomp.dylib
25+
# install_name_tool -id @executable_path/../Resources/libs/libomp.dylib LuxCore.app/Contents/Resources/libs/libomp.dylib
2626

2727
#libembree
2828

@@ -32,53 +32,53 @@ install_name_tool -id @executable_path/../Resources/libs/libembree3.3.dylib
3232
install_name_tool -change @rpath/libtbb.dylib @executable_path/../Resources/libs/libtbb.dylib LuxCore.app/Contents/Resources/libs/libembree3.3.dylib
3333
install_name_tool -change @rpath/libtbbmalloc.dylib @executable_path/../Resources/libs/libtbbmalloc.dylib LuxCore.app/Contents/Resources/libs/libembree3.3.dylib
3434

35-
#libOpenImageDenoise
36-
37-
cp -f $DEPS_SOURCE/lib/libOpenImageDenoise.1.4.0.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
38-
chmod +w LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
39-
install_name_tool -id @executable_path/../Resources/libs/libOpenImageDenoise.1.4.0.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
40-
install_name_tool -change @rpath/libtbb.dylib @executable_path/../Resources/libs/libtbb.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
41-
install_name_tool -change @rpath/libtbbmalloc.dylib @executable_path/../Resources/libs/libtbbmalloc.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
35+
# #libOpenImageDenoise
36+
#
37+
# cp -f $DEPS_SOURCE/lib/libOpenImageDenoise.1.4.0.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
38+
# chmod +w LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
39+
# install_name_tool -id @executable_path/../Resources/libs/libOpenImageDenoise.1.4.0.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
40+
# install_name_tool -change @rpath/libtbb.dylib @executable_path/../Resources/libs/libtbb.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
41+
# install_name_tool -change @rpath/libtbbmalloc.dylib @executable_path/../Resources/libs/libtbbmalloc.dylib LuxCore.app/Contents/Resources/libs/libOpenImageDenoise.1.4.0.dylib
4242

4343
#libtbb
4444

4545
cp -f $DEPS_SOURCE/lib/libtbb.dylib LuxCore.app/Contents/Resources/libs/libtbb.dylib
4646
chmod +w LuxCore.app/Contents/Resources/libs/libtbb.dylib
4747
install_name_tool -id @executable_path/../Resources/libs/libtbb.dylib LuxCore.app/Contents/Resources/libs/libtbb.dylib
4848

49-
#libtiff
50-
51-
cp -f $DEPS_SOURCE/lib/libtiff.5.dylib LuxCore.app/Contents/Resources/libs/libtiff.5.dylib
52-
chmod +w LuxCore.app/Contents/Resources/libs/libtiff.5.dylib
53-
install_name_tool -id @executable_path/../Resources/libs/libtiff.5.dylib LuxCore.app/Contents/Resources/libs/libtiff.5.dylib
54-
55-
#libOpenImageIO
56-
57-
cp -f $DEPS_SOURCE/lib/libOpenImageIO.2.2.dylib LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
58-
chmod +w LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
59-
install_name_tool -id @executable_path/../Resources/libs/libOpenImageIO.2.2.dylib LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
60-
install_name_tool -change @rpath/libtiff.5.dylib @executable_path/../Resources/libs/libtiff.5.dylib LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
49+
# #libtiff
50+
#
51+
# cp -f $DEPS_SOURCE/lib/libtiff.5.dylib LuxCore.app/Contents/Resources/libs/libtiff.5.dylib
52+
# chmod +w LuxCore.app/Contents/Resources/libs/libtiff.5.dylib
53+
# install_name_tool -id @executable_path/../Resources/libs/libtiff.5.dylib LuxCore.app/Contents/Resources/libs/libtiff.5.dylib
54+
#
55+
# #libOpenImageIO
56+
#
57+
# cp -f $DEPS_SOURCE/lib/libOpenImageIO.2.2.dylib LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
58+
# chmod +w LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
59+
# install_name_tool -id @executable_path/../Resources/libs/libOpenImageIO.2.2.dylib LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
60+
# install_name_tool -change @rpath/libtiff.5.dylib @executable_path/../Resources/libs/libtiff.5.dylib LuxCore.app/Contents/Resources/libs/libOpenImageIO.2.2.dylib
6161

6262
#libtbbmalloc
6363

6464
cp -f $DEPS_SOURCE/lib/libtbbmalloc.dylib LuxCore.app/Contents/Resources/libs/libtbbmalloc.dylib
6565
chmod +w LuxCore.app/Contents/Resources/libs/libtbbmalloc.dylib
6666
install_name_tool -id @executable_path/../Resources/libs/libtbbmalloc.dylib LuxCore.app/Contents/Resources/libs/libtbbmalloc.dylib
6767

68-
#cuda
69-
70-
cp -f $DEPS_SOURCE/lib/libcuda.dylib LuxCore.app/Contents/Resources/libs/libcuda.dylib
71-
cp -f $DEPS_SOURCE/lib/libnvrtc.dylib LuxCore.app/Contents/Resources/libs/libnvrtc.dylib
68+
# #cuda
69+
#
70+
# cp -f $DEPS_SOURCE/lib/libcuda.dylib LuxCore.app/Contents/Resources/libs/libcuda.dylib
71+
# cp -f $DEPS_SOURCE/lib/libnvrtc.dylib LuxCore.app/Contents/Resources/libs/libnvrtc.dylib
7272

7373
#luxcoreui
7474

75-
install_name_tool -change @rpath/libomp.dylib @executable_path/../Resources/libs/libomp.dylib LuxCore.app/Contents/MacOS/luxcoreui
75+
#install_name_tool -change @rpath/libomp.dylib @executable_path/../Resources/libs/libomp.dylib LuxCore.app/Contents/MacOS/luxcoreui
7676
install_name_tool -change @rpath/libembree3.3.dylib @executable_path/../Resources/libs/libembree3.3.dylib LuxCore.app/Contents/MacOS/luxcoreui
7777
install_name_tool -change @rpath/libtbb.dylib @executable_path/../Resources/libs/libtbb.dylib LuxCore.app/Contents/MacOS/luxcoreui
78-
install_name_tool -change @rpath/libOpenImageIO.2.2.dylib @executable_path/../Resources/libs/libOpenImageIO.2.2.dylib LuxCore.app/Contents/MacOS/luxcoreui
78+
#install_name_tool -change @rpath/libOpenImageIO.2.2.dylib @executable_path/../Resources/libs/libOpenImageIO.2.2.dylib LuxCore.app/Contents/MacOS/luxcoreui
7979
install_name_tool -change @rpath/libtbbmalloc.dylib @executable_path/../Resources/libs/libtbbmalloc.dylib LuxCore.app/Contents/MacOS/luxcoreui
80-
install_name_tool -change @rpath/libtiff.5.dylib @executable_path/../Resources/libs/libtiff.5.dylib LuxCore.app/Contents/MacOS/luxcoreui
81-
install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @executable_path/../Resources/libs/libOpenImageDenoise.1.4.0.dylib LuxCore.app/Contents/MacOS/luxcoreui
80+
#install_name_tool -change @rpath/libtiff.5.dylib @executable_path/../Resources/libs/libtiff.5.dylib LuxCore.app/Contents/MacOS/luxcoreui
81+
#install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @executable_path/../Resources/libs/libOpenImageDenoise.1.4.0.dylib LuxCore.app/Contents/MacOS/luxcoreui
8282

8383
echo "LuxCoreUi installed"
8484

@@ -88,13 +88,13 @@ cp ../build/Release/luxcoreconsole LuxCore.app/Contents/MacOS
8888

8989
#luxcoreconsole
9090

91-
install_name_tool -change @rpath/libomp.dylib @executable_path/../Resources/libs/libomp.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
91+
#install_name_tool -change @rpath/libomp.dylib @executable_path/../Resources/libs/libomp.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
9292
install_name_tool -change @rpath/libembree3.3.dylib @executable_path/../Resources/libs/libembree3.3.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
9393
install_name_tool -change @rpath/libtbb.dylib @executable_path/../Resources/libs/libtbb.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
94-
install_name_tool -change @rpath/libOpenImageIO.2.2.dylib @executable_path/../Resources/libs/libOpenImageIO.2.2.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
94+
#install_name_tool -change @rpath/libOpenImageIO.2.2.dylib @executable_path/../Resources/libs/libOpenImageIO.2.2.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
9595
install_name_tool -change @rpath/libtbbmalloc.dylib @executable_path/../Resources/libs/libtbbmalloc.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
96-
install_name_tool -change @rpath/libtiff.5.dylib @executable_path/../Resources/libs/libtiff.5.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
97-
install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @executable_path/../Resources/libs/libOpenImageDenoise.1.4.0.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
96+
#install_name_tool -change @rpath/libtiff.5.dylib @executable_path/../Resources/libs/libtiff.5.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
97+
#install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @executable_path/../Resources/libs/libOpenImageDenoise.1.4.0.dylib ./LuxCore.app/Contents/MacOS/luxcoreconsole
9898

9999
echo "LuxCoreConsole installed"
100100

@@ -107,11 +107,11 @@ cp ../build/lib/pyluxcoretools.zip pyluxcore
107107

108108
cd pyluxcore
109109

110-
#libomp
111-
112-
cp -f $DEPS_SOURCE/lib/libomp.dylib ./libomp.dylib
113-
chmod +w ./libomp.dylib
114-
install_name_tool -id @loader_path/libomp.dylib ./libomp.dylib
110+
# #libomp
111+
#
112+
# cp -f $DEPS_SOURCE/lib/libomp.dylib ./libomp.dylib
113+
# chmod +w ./libomp.dylib
114+
# install_name_tool -id @loader_path/libomp.dylib ./libomp.dylib
115115

116116
#libembree
117117

@@ -123,47 +123,47 @@ cp -f $DEPS_SOURCE/lib/libtbb.dylib ./libtbb.dylib
123123
chmod +w ./libtbb.dylib
124124
install_name_tool -id @loader_path/libtbb.dylib ./libtbb.dylib
125125

126-
#libtiff
127-
128-
cp -f $DEPS_SOURCE/lib/libtiff.5.dylib ./libtiff.5.dylib
129-
chmod +w ./libtiff.5.dylib
130-
install_name_tool -id @loader_path/libtiff.5.dylib ./libtiff.5.dylib
131-
132-
#libOpenImageIO
133-
134-
cp -f $DEPS_SOURCE/lib/libOpenImageIO.2.2.dylib ./libOpenImageIO.2.2.dylib
135-
chmod +w ./libOpenImageIO.2.2.dylib
136-
install_name_tool -id @loader_path/libOpenImageIO.2.2.dylib ./libOpenImageIO.2.2.dylib
137-
install_name_tool -change @rpath/libtiff.5.dylib @loader_path/libtiff.5.dylib ./libOpenImageIO.2.2.dylib
126+
# #libtiff
127+
#
128+
# cp -f $DEPS_SOURCE/lib/libtiff.5.dylib ./libtiff.5.dylib
129+
# chmod +w ./libtiff.5.dylib
130+
# install_name_tool -id @loader_path/libtiff.5.dylib ./libtiff.5.dylib
131+
#
132+
# #libOpenImageIO
133+
#
134+
# cp -f $DEPS_SOURCE/lib/libOpenImageIO.2.2.dylib ./libOpenImageIO.2.2.dylib
135+
# chmod +w ./libOpenImageIO.2.2.dylib
136+
# install_name_tool -id @loader_path/libOpenImageIO.2.2.dylib ./libOpenImageIO.2.2.dylib
137+
# install_name_tool -change @rpath/libtiff.5.dylib @loader_path/libtiff.5.dylib ./libOpenImageIO.2.2.dylib
138138

139139
#libtbbmalloc
140140

141141
cp -f $DEPS_SOURCE/lib/libtbbmalloc.dylib ./libtbbmalloc.dylib
142142
chmod +w ./libtbbmalloc.dylib
143143
install_name_tool -id @loader_path/libtbbmalloc.dylib ./libtbbmalloc.dylib
144144

145-
#libOpenImageDenoise
146-
147-
cp -f $DEPS_SOURCE/lib/libOpenImageDenoise.1.4.0.dylib ./libOpenImageDenoise.1.4.0.dylib
148-
chmod +w ./libOpenImageDenoise.1.4.0.dylib
149-
install_name_tool -id @loader_path/libOpenImageDenoise.1.4.0.dylib ./libOpenImageDenoise.1.4.0.dylib
150-
install_name_tool -change @rpath/libtbb.dylib @loader_path/libtbb.dylib ./libOpenImageDenoise.1.4.0.dylib
151-
install_name_tool -change @rpath/libtbbmalloc.dylib @loader_path/libtbbmalloc.dylib ./libOpenImageDenoise.1.4.0.dylib
152-
153-
#cuda
154-
155-
cp -f $DEPS_SOURCE/lib/libcuda.dylib ./libcuda.dylib
156-
cp -f $DEPS_SOURCE/lib/libnvrtc.dylib ./libnvrtc.dylib
145+
# #libOpenImageDenoise
146+
#
147+
# cp -f $DEPS_SOURCE/lib/libOpenImageDenoise.1.4.0.dylib ./libOpenImageDenoise.1.4.0.dylib
148+
# chmod +w ./libOpenImageDenoise.1.4.0.dylib
149+
# install_name_tool -id @loader_path/libOpenImageDenoise.1.4.0.dylib ./libOpenImageDenoise.1.4.0.dylib
150+
# install_name_tool -change @rpath/libtbb.dylib @loader_path/libtbb.dylib ./libOpenImageDenoise.1.4.0.dylib
151+
# install_name_tool -change @rpath/libtbbmalloc.dylib @loader_path/libtbbmalloc.dylib ./libOpenImageDenoise.1.4.0.dylib
152+
#
153+
# #cuda
154+
#
155+
# cp -f $DEPS_SOURCE/lib/libcuda.dylib ./libcuda.dylib
156+
# cp -f $DEPS_SOURCE/lib/libnvrtc.dylib ./libnvrtc.dylib
157157

158158
#pyluxcore.so
159159

160-
install_name_tool -change @rpath/libomp.dylib @loader_path/libomp.dylib pyluxcore.so
160+
#install_name_tool -change @rpath/libomp.dylib @loader_path/libomp.dylib pyluxcore.so
161161
install_name_tool -change @rpath/libembree3.3.dylib @loader_path/libembree3.3.dylib pyluxcore.so
162162
install_name_tool -change @rpath/libtbb.dylib @loader_path/libtbb.dylib pyluxcore.so
163-
install_name_tool -change @rpath/libtiff.5.dylib @loader_path/libtiff.5.dylib pyluxcore.so
164-
install_name_tool -change @rpath/libOpenImageIO.2.2.dylib @loader_path/libOpenImageIO.2.2.dylib pyluxcore.so
163+
#install_name_tool -change @rpath/libtiff.5.dylib @loader_path/libtiff.5.dylib pyluxcore.so
164+
#install_name_tool -change @rpath/libOpenImageIO.2.2.dylib @loader_path/libOpenImageIO.2.2.dylib pyluxcore.so
165165
install_name_tool -change @rpath/libtbbmalloc.dylib @loader_path/libtbbmalloc.dylib pyluxcore.so
166-
install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @loader_path/libOpenImageDenoise.1.4.0.dylib pyluxcore.so
166+
#install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @loader_path/libOpenImageDenoise.1.4.0.dylib pyluxcore.so
167167

168168
echo "PyLuxCore installed"
169169

@@ -173,8 +173,8 @@ echo "PyLuxCore installed"
173173
cp ../../macos/bin/oidnDenoise .
174174
chmod +w ./oidnDenoise
175175
install_name_tool -id @executable_path/oidnDenoise ./oidnDenoise
176-
install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @executable_path/libOpenImageDenoise.1.4.0.dylib oidnDenoise
177-
install_name_tool -change @rpath/libOpenImageDenoise.1.4.0.dylib @executable_path/libOpenImageDenoise.1.4.0.dylib oidnDenoise
176+
#install_name_tool -change @rpath/libOpenImageDenoise.1.dylib @executable_path/libOpenImageDenoise.1.4.0.dylib oidnDenoise
177+
#install_name_tool -change @rpath/libOpenImageDenoise.1.4.0.dylib @executable_path/libOpenImageDenoise.1.4.0.dylib oidnDenoise
178178
install_name_tool -change @rpath/libtbb.dylib @executable_path/libtbb.dylib oidnDenoise
179179
install_name_tool -change @rpath/libtbbmalloc.dylib @executable_path/libtbbmalloc.dylib oidnDenoise
180180

0 commit comments

Comments
 (0)