Rename library name meshlite to meshlite_ffi
parent
e2f44dded7
commit
dbb23b9029
10
.travis.yml
10
.travis.yml
|
@ -62,12 +62,12 @@ install:
|
||||||
script:
|
script:
|
||||||
# Build Meshlite
|
# Build Meshlite
|
||||||
- git clone https://github.com/huxingyi/meshlite.git || travis_terminate 1
|
- git clone https://github.com/huxingyi/meshlite.git || travis_terminate 1
|
||||||
- cd meshlite
|
- cd meshlite/ffi
|
||||||
- cargo build --release
|
- cargo build --release
|
||||||
- cd ../
|
- cd ../../
|
||||||
- cp meshlite/include/meshlite.h thirdparty/meshlite/meshlite.h || travis_terminate 1
|
- cp meshlite/ffi/include/meshlite.h thirdparty/meshlite/meshlite.h || travis_terminate 1
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp meshlite/target/release/libmeshlite.dylib thirdparty/meshlite/libmeshlite.dylib || travis_terminate 1; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp meshlite/ffi/target/release/libmeshlite_ffi.dylib thirdparty/meshlite/libmeshlite_ffi.dylib || travis_terminate 1; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp meshlite/target/release/libmeshlite.so thirdparty/meshlite/libmeshlite.so || travis_terminate 1; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp meshlite/ffi/target/release/libmeshlite_ffi.so thirdparty/meshlite/libmeshlite_ffi.so || travis_terminate 1; fi
|
||||||
|
|
||||||
# Build Dust3D
|
# Build Dust3D
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then qmake -config release || travis_terminate 1; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then qmake -config release || travis_terminate 1; fi
|
||||||
|
|
18
appveyor.yml
18
appveyor.yml
|
@ -6,15 +6,15 @@ environment:
|
||||||
# target: x86_64-pc-windows-msvc
|
# target: x86_64-pc-windows-msvc
|
||||||
# qtdir: C:\Qt\5.10.1\msvc2015_64
|
# qtdir: C:\Qt\5.10.1\msvc2015_64
|
||||||
# sysdirname: SysWOW64
|
# sysdirname: SysWOW64
|
||||||
|
|
||||||
- platform: x86
|
- platform: x86
|
||||||
target: i686-pc-windows-msvc
|
target: i686-pc-windows-msvc
|
||||||
qtdir: C:\Qt\5.10.1\msvc2015
|
qtdir: C:\Qt\5.10.1\msvc2015
|
||||||
sysdirname: system32
|
sysdirname: system32
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
CGAL-4.11.1-Setup.exe -> appveyor.yml
|
CGAL-4.11.1-Setup.exe -> appveyor.yml
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if "%PLATFORM%" == "x86"
|
- if "%PLATFORM%" == "x86"
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
|
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
|
||||||
|
@ -34,19 +34,19 @@ install:
|
||||||
cmake -G "Visual Studio 14 2015 Win64" ../ -DBOOST_INCLUDEDIR=C:\Libraries\boost_1_66_0
|
cmake -G "Visual Studio 14 2015 Win64" ../ -DBOOST_INCLUDEDIR=C:\Libraries\boost_1_66_0
|
||||||
- msbuild /p:Configuration=Release ALL_BUILD.vcxproj
|
- msbuild /p:Configuration=Release ALL_BUILD.vcxproj
|
||||||
- cd %APPVEYOR_BUILD_FOLDER%
|
- cd %APPVEYOR_BUILD_FOLDER%
|
||||||
|
|
||||||
build: false
|
build: false
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- set PATH=%PATH%;%QTDIR%\bin
|
- set PATH=%PATH%;%QTDIR%\bin
|
||||||
- qmake "BOOST_INCLUDEDIR=C:\Libraries\boost_1_66_0" "CGAL_DIR=%APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1"
|
- qmake "BOOST_INCLUDEDIR=C:\Libraries\boost_1_66_0" "CGAL_DIR=%APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1"
|
||||||
- nmake -f Makefile.Release
|
- nmake -f Makefile.Release
|
||||||
|
|
||||||
after_test:
|
after_test:
|
||||||
# Check deps by Dependency Walker
|
# Check deps by Dependency Walker
|
||||||
# Check Qt plugins by following https://wiki.qt.io/Deploy_an_Application_on_Windows
|
# Check Qt plugins by following https://wiki.qt.io/Deploy_an_Application_on_Windows
|
||||||
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\release\dust3d.exe
|
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\release\dust3d.exe
|
||||||
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\meshlite\meshlite_unstable_vc14_%PLATFORM%\meshlite.dll
|
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\meshlite\meshlite_unstable_vc14_%PLATFORM%\meshlite_ffi.dll
|
||||||
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1\build\bin\Release\CGAL-vc140-mt-4.11.1.dll
|
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1\build\bin\Release\CGAL-vc140-mt-4.11.1.dll
|
||||||
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1\auxiliary\gmp\lib\libgmp-10.dll
|
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1\auxiliary\gmp\lib\libgmp-10.dll
|
||||||
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1\auxiliary\gmp\lib\libmpfr-4.dll
|
- 7z a dust3d_unstable_%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1\auxiliary\gmp\lib\libmpfr-4.dll
|
||||||
|
@ -59,11 +59,11 @@ after_test:
|
||||||
- mkdir platforms
|
- mkdir platforms
|
||||||
- copy %QTDIR%\plugins\platforms\qwindows.dll %APPVEYOR_BUILD_FOLDER%\platforms\qwindows.dll
|
- copy %QTDIR%\plugins\platforms\qwindows.dll %APPVEYOR_BUILD_FOLDER%\platforms\qwindows.dll
|
||||||
- 7z a dust3d_unstable_%PLATFORM%.zip -r %APPVEYOR_BUILD_FOLDER%\platforms\
|
- 7z a dust3d_unstable_%PLATFORM%.zip -r %APPVEYOR_BUILD_FOLDER%\platforms\
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: '*.zip'
|
- path: '*.zip'
|
||||||
name: platform_zips
|
name: platform_zips
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
release: unstable
|
release: unstable
|
||||||
description: 'Unstable release for test purpose only. The source code is attached when this release first created, and it is not get updated while the binary been replaced.'
|
description: 'Unstable release for test purpose only. The source code is attached when this release first created, and it is not get updated while the binary been replaced.'
|
||||||
|
@ -75,4 +75,4 @@ deploy:
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
on:
|
on:
|
||||||
branch: master # release from master branch only
|
branch: master # release from master branch only
|
||||||
|
|
|
@ -42,10 +42,10 @@ Here is the snapshot of the command line of one build, you may use different def
|
||||||
|
|
||||||
$ cd /Users/jeremy/Desktop
|
$ cd /Users/jeremy/Desktop
|
||||||
$ git clone https://github.com/huxingyi/meshlite.git
|
$ git clone https://github.com/huxingyi/meshlite.git
|
||||||
$ cd meshlite
|
$ cd meshlite/ffi
|
||||||
$ cargo build --release
|
$ cargo build --release
|
||||||
$ cp include/meshlite.h /Users/jeremy/Repositories/dust3d/thirdparty/meshlite/meshlite.h
|
$ cp include/meshlite.h /Users/jeremy/Repositories/dust3d/thirdparty/meshlite/meshlite.h
|
||||||
$ cp target/release/libmeshlite.dylib /Users/jeremy/Repositories/dust3d/thirdparty/meshlite/libmeshlite.dylib
|
$ cp target/release/libmeshlite_ffi.dylib /Users/jeremy/Repositories/dust3d/thirdparty/meshlite/libmeshlite_ffi.dylib
|
||||||
|
|
||||||
$ cd /Users/jeremy/Repositories/dust3d
|
$ cd /Users/jeremy/Repositories/dust3d
|
||||||
$ qmake -spec macx-xcode
|
$ qmake -spec macx-xcode
|
||||||
|
@ -83,10 +83,10 @@ Here is the snapshot of the command line of one build, you may use different def
|
||||||
;Compile the internal dependency
|
;Compile the internal dependency
|
||||||
$ cd ~/Desktop
|
$ cd ~/Desktop
|
||||||
$ git clone https://github.com/huxingyi/meshlite.git
|
$ git clone https://github.com/huxingyi/meshlite.git
|
||||||
$ cd meshlite
|
$ cd meshlite/ffi
|
||||||
$ cargo build --release
|
$ cargo build --release
|
||||||
$ cp ~/Desktop/meshlite/include/meshlite.h ~/Documents/dust3d/thirdparty/meshlite/meshlite.h
|
$ cp ~/Desktop/meshlite/ffi/include/meshlite.h ~/Documents/dust3d/thirdparty/meshlite/meshlite.h
|
||||||
$ cp ~/Desktop/meshlite/target/release/libmeshlite.so ~/Documents/dust3d/thirdparty/meshlite/libmeshlite.so
|
$ cp ~/Desktop/meshlite/ffi/target/release/libmeshlite_ffi.so ~/Documents/dust3d/thirdparty/meshlite/libmeshlite_ffi.so
|
||||||
|
|
||||||
;Compile Dust3D
|
;Compile Dust3D
|
||||||
$ cd ~/Documents/dust3d
|
$ cd ~/Documents/dust3d
|
||||||
|
|
12
dust3d.pro
12
dust3d.pro
|
@ -388,14 +388,14 @@ QMAKE_CXXFLAGS += -std=c++11
|
||||||
win32 {
|
win32 {
|
||||||
LIBS += -luser32
|
LIBS += -luser32
|
||||||
LIBS += -lopengl32
|
LIBS += -lopengl32
|
||||||
|
|
||||||
isEmpty(BOOST_INCLUDEDIR) {
|
isEmpty(BOOST_INCLUDEDIR) {
|
||||||
BOOST_INCLUDEDIR = $$(BOOST_INCLUDEDIR)
|
BOOST_INCLUDEDIR = $$(BOOST_INCLUDEDIR)
|
||||||
}
|
}
|
||||||
isEmpty(CGAL_DIR) {
|
isEmpty(CGAL_DIR) {
|
||||||
CGAL_DIR = $$(CGAL_DIR)
|
CGAL_DIR = $$(CGAL_DIR)
|
||||||
}
|
}
|
||||||
|
|
||||||
isEmpty(BOOST_INCLUDEDIR) {
|
isEmpty(BOOST_INCLUDEDIR) {
|
||||||
error("No BOOST_INCLUDEDIR define found in enviroment variables")
|
error("No BOOST_INCLUDEDIR define found in enviroment variables")
|
||||||
}
|
}
|
||||||
|
@ -409,7 +409,7 @@ win32 {
|
||||||
} else {
|
} else {
|
||||||
MESHLITE_DIR = thirdparty/meshlite/meshlite_unstable_vc14_x86
|
MESHLITE_DIR = thirdparty/meshlite/meshlite_unstable_vc14_x86
|
||||||
}
|
}
|
||||||
MESHLITE_LIBNAME = meshlite.dll
|
MESHLITE_LIBNAME = meshlite_ffi.dll
|
||||||
GMP_LIBNAME = libgmp-10
|
GMP_LIBNAME = libgmp-10
|
||||||
MPFR_LIBNAME = libmpfr-4
|
MPFR_LIBNAME = libmpfr-4
|
||||||
CGAL_LIBNAME = CGAL-vc140-mt-4.11.1
|
CGAL_LIBNAME = CGAL-vc140-mt-4.11.1
|
||||||
|
@ -424,7 +424,7 @@ win32 {
|
||||||
|
|
||||||
macx {
|
macx {
|
||||||
MESHLITE_DIR = thirdparty/meshlite
|
MESHLITE_DIR = thirdparty/meshlite
|
||||||
MESHLITE_LIBNAME = meshlite
|
MESHLITE_LIBNAME = meshlite_ffi
|
||||||
GMP_LIBNAME = gmp
|
GMP_LIBNAME = gmp
|
||||||
MPFR_LIBNAME = mpfr
|
MPFR_LIBNAME = mpfr
|
||||||
CGAL_LIBNAME = cgal
|
CGAL_LIBNAME = cgal
|
||||||
|
@ -440,14 +440,14 @@ macx {
|
||||||
exists(/usr/local/opt/opencv) {
|
exists(/usr/local/opt/opencv) {
|
||||||
INCLUDEPATH += /usr/local/opt/opencv/include
|
INCLUDEPATH += /usr/local/opt/opencv/include
|
||||||
LIBS += -L/usr/local/opt/opencv/lib -lopencv_core -lopencv_videoio -lopencv_imgproc
|
LIBS += -L/usr/local/opt/opencv/lib -lopencv_core -lopencv_videoio -lopencv_imgproc
|
||||||
|
|
||||||
DEFINES += "USE_OPENCV=1"
|
DEFINES += "USE_OPENCV=1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unix:!macx {
|
unix:!macx {
|
||||||
MESHLITE_DIR = thirdparty/meshlite
|
MESHLITE_DIR = thirdparty/meshlite
|
||||||
MESHLITE_LIBNAME = meshlite
|
MESHLITE_LIBNAME = meshlite_ffi
|
||||||
GMP_LIBNAME = gmp
|
GMP_LIBNAME = gmp
|
||||||
MPFR_LIBNAME = mpfr
|
MPFR_LIBNAME = mpfr
|
||||||
CGAL_LIBNAME = CGAL
|
CGAL_LIBNAME = CGAL
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue