Rename library name meshlite to meshlite_ffi

master
Jeremy Hu 2018-09-28 10:45:39 +08:00
parent e2f44dded7
commit dbb23b9029
12 changed files with 25 additions and 25 deletions

View File

@ -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

View File

@ -46,7 +46,7 @@ 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

View File

@ -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

View File

@ -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
@ -447,7 +447,7 @@ macx {
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.