File tree Expand file tree Collapse file tree 3 files changed +38
-34
lines changed
Expand file tree Collapse file tree 3 files changed +38
-34
lines changed Original file line number Diff line number Diff line change @@ -307,6 +307,7 @@ mkdir msysDLLs
307307mkdir additionalDLLs
308308mkdir build
309309mkdir msysDLLs/imageformats
310+ mkdir msysDLLs/platforms
310311
311312ls roboschool/cpp-household/bullet_local_install/bin/
312313cp roboschool/cpp-household/bullet_local_install/bin/* additionalDLLs/
@@ -326,6 +327,9 @@ cp qt/mingw64/share/qt5/plugins/imageformats/qicns.dll msysDLLs/imageformats/
326327cp qt/mingw64/share/qt5/plugins/imageformats/qico.dll msysDLLs/imageformats/
327328cp qt/mingw64/share/qt5/plugins/imageformats/qjp2.dll msysDLLs/imageformats/
328329cp qt/mingw64/share/qt5/plugins/imageformats/qjpeg.dll msysDLLs/imageformats/
330+
331+ cp qt/mingw64/share/qt5/plugins/platforms/* .dll msysDLLs/platforms/
332+
329333cp bzip2/mingw64/bin/libbz2-1.dll msysDLLs/
330334cp freetype/mingw64/bin/libfreetype-6.dll msysDLLs/
331335cp glib2/mingw64/bin/libglib-2.0-0.dll msysDLLs/
Original file line number Diff line number Diff line change @@ -124,11 +124,11 @@ if [ $? != 0 ]
124124then
125125 exit 1
126126fi
127- wget -O boost_2_mvc.7z https://dl.bintray.com/thecrazyt/roboschool/boost_2_mvc.7z
128- if [ $? != 0 ]
129- then
130- exit 1
131- fi
127+ # wget -O boost_2_mvc.7z https://dl.bintray.com/thecrazyt/roboschool/boost_2_mvc.7z
128+ # if [ $? != 0 ]
129+ # then
130+ # exit 1
131+ # fi
132132
133133sudo sed ' s/\(.include *.ansidecl.h.\)/\/\/\1/g' -i /usr/share/mingw-w64/include/ieeefp.h
134134if [ $? != 0 ]
Original file line number Diff line number Diff line change 2828 exit 1
2929fi
3030mv mingw-w64-x86_64-boost-1.66.0-1-any.pkg.tar.xz boost/
31- mv boost_2_mvc.7z boost/
31+ # mv boost_2_mvc.7z boost/
3232if [ $? != 0 ]
3333then
3434 exit 1
@@ -48,7 +48,7 @@ ls mingw64
4848if [ $? != 0 ]
4949then
5050 ls -lah mingw-w64-x86_64-qt5-5.10.0-1-any.pkg.tar.xz
51- tar xf mingw-w64-x86_64-qt5-5.10.0-1-any.pkg.tar.xz mingw64/include/ mingw64/bin/ mingw64/lib/ mingw64/share/qt5/plugins/imageformats 1> /dev/null 2> /dev/null
51+ tar xf mingw-w64-x86_64-qt5-5.10.0-1-any.pkg.tar.xz mingw64/include/ mingw64/bin/ mingw64/lib/ mingw64/share/qt5/plugins/imageformats mingw64/share/qt5/plugins/platforms 1> /dev/null 2> /dev/null
5252 if [ $? != 0 ]
5353 then
5454 exit 1
6868 fi
6969 rm mingw-w64-x86_64-python3-3.6.4-1-any.pkg.tar.xz
7070
71- wget https://dl.bintray.com/thecrazyt/roboschool/python_include.7z
72- if [ $? != 0 ]
73- then
74- exit 1
75- fi
76- 7zr x python_include.7z
77- if [ $? != 0 ]
78- then
79- exit 1
80- fi
81- rm -Rf mingw64/include/python3.6m
82- mv include mingw64/include/python3.6m
83-
84- if [ $? != 0 ]
85- then
86- exit 1
87- fi
71+ # wget https://dl.bintray.com/thecrazyt/roboschool/python_include.7z
72+ # if [ $? != 0 ]
73+ # then
74+ # exit 1
75+ # fi
76+ # 7zr x python_include.7z
77+ # if [ $? != 0 ]
78+ # then
79+ # exit 1
80+ # fi
81+ # rm -Rf mingw64/include/python3.6m
82+ # mv include mingw64/include/python3.6m
83+ #
84+ # if [ $? != 0 ]
85+ # then
86+ # exit 1
87+ # fi
8888fi
8989
9090cd ../boost
9999 fi
100100 rm mingw-w64-x86_64-boost-1.66.0-1-any.pkg.tar.xz
101101
102- 7zr x boost_2_mvc.7z
103- if [ $? != 0 ]
104- then
105- exit 1
106- fi
107- patch -f -p3 < boost_2_mvc.patch
108- if [ $? != 0 ]
109- then
110- exit 1
111- fi
102+ # 7zr x boost_2_mvc.7z
103+ # if [ $? != 0 ]
104+ # then
105+ # exit 1
106+ # fi
107+ # patch -f -p3 < boost_2_mvc.patch
108+ # if [ $? != 0 ]
109+ # then
110+ # exit 1
111+ # fi
112112fi
113113
114114cd ../assimp
You can’t perform that action at this time.
0 commit comments