Rename library name meshlite to meshlite_ffi
parent
e2f44dded7
commit
dbb23b9029
10
.travis.yml
10
.travis.yml
|
@ -62,12 +62,12 @@ install:
|
|||
script:
|
||||
# Build Meshlite
|
||||
- git clone https://github.com/huxingyi/meshlite.git || travis_terminate 1
|
||||
- cd meshlite
|
||||
- cd meshlite/ffi
|
||||
- cargo build --release
|
||||
- cd ../
|
||||
- cp meshlite/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" == "linux" ]]; then cp meshlite/target/release/libmeshlite.so thirdparty/meshlite/libmeshlite.so || travis_terminate 1; fi
|
||||
- cd ../../
|
||||
- cp meshlite/ffi/include/meshlite.h thirdparty/meshlite/meshlite.h || travis_terminate 1
|
||||
- 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/ffi/target/release/libmeshlite_ffi.so thirdparty/meshlite/libmeshlite_ffi.so || travis_terminate 1; fi
|
||||
|
||||
# Build Dust3D
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then qmake -config release || travis_terminate 1; fi
|
||||
|
|
|
@ -46,7 +46,7 @@ after_test:
|
|||
# Check deps by Dependency Walker
|
||||
# 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%\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\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
|
||||
|
|
|
@ -42,10 +42,10 @@ Here is the snapshot of the command line of one build, you may use different def
|
|||
|
||||
$ cd /Users/jeremy/Desktop
|
||||
$ git clone https://github.com/huxingyi/meshlite.git
|
||||
$ cd meshlite
|
||||
$ cd meshlite/ffi
|
||||
$ cargo build --release
|
||||
$ 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
|
||||
$ 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
|
||||
$ cd ~/Desktop
|
||||
$ git clone https://github.com/huxingyi/meshlite.git
|
||||
$ cd meshlite
|
||||
$ cd meshlite/ffi
|
||||
$ cargo build --release
|
||||
$ cp ~/Desktop/meshlite/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/include/meshlite.h ~/Documents/dust3d/thirdparty/meshlite/meshlite.h
|
||||
$ cp ~/Desktop/meshlite/ffi/target/release/libmeshlite_ffi.so ~/Documents/dust3d/thirdparty/meshlite/libmeshlite_ffi.so
|
||||
|
||||
;Compile Dust3D
|
||||
$ cd ~/Documents/dust3d
|
||||
|
|
|
@ -409,7 +409,7 @@ win32 {
|
|||
} else {
|
||||
MESHLITE_DIR = thirdparty/meshlite/meshlite_unstable_vc14_x86
|
||||
}
|
||||
MESHLITE_LIBNAME = meshlite.dll
|
||||
MESHLITE_LIBNAME = meshlite_ffi.dll
|
||||
GMP_LIBNAME = libgmp-10
|
||||
MPFR_LIBNAME = libmpfr-4
|
||||
CGAL_LIBNAME = CGAL-vc140-mt-4.11.1
|
||||
|
@ -424,7 +424,7 @@ win32 {
|
|||
|
||||
macx {
|
||||
MESHLITE_DIR = thirdparty/meshlite
|
||||
MESHLITE_LIBNAME = meshlite
|
||||
MESHLITE_LIBNAME = meshlite_ffi
|
||||
GMP_LIBNAME = gmp
|
||||
MPFR_LIBNAME = mpfr
|
||||
CGAL_LIBNAME = cgal
|
||||
|
@ -447,7 +447,7 @@ macx {
|
|||
|
||||
unix:!macx {
|
||||
MESHLITE_DIR = thirdparty/meshlite
|
||||
MESHLITE_LIBNAME = meshlite
|
||||
MESHLITE_LIBNAME = meshlite_ffi
|
||||
GMP_LIBNAME = gmp
|
||||
MPFR_LIBNAME = mpfr
|
||||
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