x64-windows-release

fanvanzh · May 23, 2024 · d07ddbe · d07ddbe
1 parent 79c0296
commit d07ddbe
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 25 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -1,12 +1,12 @@
-name: Linux
+name: Ubuntu
 
 on: [push]
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies on Ubuntu
       if: runner.os == 'Linux'

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,29 +6,25 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@4
 
     - name: Cache dependencies
-      uses: actions/cache@v2  # 使用actions/cache
+      uses: actions/cache@v4
+      id: cache-vcpkg
       with:
-        path: ./vcpkg  # 设置缓存目录路径
-        key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/build.rs') }}  # 设置缓存的key
-        restore-keys: |  # 设置恢复缓存的key列表
+        path: ./vcpkg
+        key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/build.rs') }}
+        restore-keys: |
           ${{ runner.os }}-vcpkg-
 
     - name: Install dependencies on Windows
-      if: runner.os == 'Windows'
+      if: steps.cache-vcpkg.outputs.cache-hit != 'true'
       run: |
-        if (-Not (Test-Path "./vcpkg")) {
-          git clone https://github.com/microsoft/vcpkg.git
-          ./vcpkg/bootstrap-vcpkg.bat
-          ./vcpkg/vcpkg install gdal:x64-windows
-          ./vcpkg/vcpkg install osg:x64-windows
-          tree ./vcpkg/installed /F /A
-        }
-        else {
-          Write-Host "vcpkg directory exists. Skipping installation."
-        }
+        git clone https://github.com/microsoft/vcpkg.git
+        ./vcpkg/bootstrap-vcpkg.bat
+        ./vcpkg/vcpkg install gdal:x64-windows-release
+        ./vcpkg/vcpkg install osg:x64-windows-release
+        tree ./vcpkg/installed /F /A
 
     - name: Build
       run: cargo build --verbose --release
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ git clone https://github.com/fanvanzh/3dtiles
 cd 3dtiles
 git clone https://github.com/microsoft/vcpkg.git
 ./vcpkg/bootstrap-vcpkg.sh
-./vcpkg/vcpkg install osg
+./vcpkg/vcpkg install osg:x64-linux-release
 cargo build --release
 ```
 ## Windows
@@ -52,8 +52,8 @@ git clone https://github.com/fanvanzh/3dtiles
 cd 3dtiles
 git clone https://github.com/microsoft/vcpkg.git
 ./vcpkg/bootstrap-vcpkg.bat
-./vcpkg/vcpkg install osg:x64-windows
-./vcpkg/vcpkg install gdal:x64-windows
+./vcpkg/vcpkg install osg:x64-windows-release
+./vcpkg/vcpkg install gdal:x64-windows-release
 cargo build --release
 ```
 # Usage

diff --git a/build.rs b/build.rs
@@ -11,15 +11,15 @@ fn build_win_msvc() {
         .define("WIN32", None)
         .define("_WINDOWS", None)
         .include("./src")
-        .include("./vcpkg/installed/x64-windows/include")
+        .include("./vcpkg/installed/x64-windows-release/include")
         .file("./src/tileset.cpp")
         .file("./src/shp23dtile.cpp")
         .file("./src/osgb23dtile.cpp")
         .file("./src/dxt_img.cpp")
         .file("./src/GeoTransform.cpp")
         .compile("_3dtile");
     // -------------
-    println!("cargo:rustc-link-search=native=./vcpkg/installed/x64-windows/lib");
+    println!("cargo:rustc-link-search=native=./vcpkg/installed/x64-windows-release/lib");
     // ------ GDAL library -------
     println!("cargo:rustc-link-lib=gdal");
     // ------ OSG library --------
@@ -36,7 +36,7 @@ fn build_linux_unkonw() {
         .flag("-std=c++11")
         .warnings(false)
         .include("./src")
-        .include("./vcpkg/installed/x64-linux/include")
+        .include("./vcpkg/installed/x64-linux-release/include")
         .file("./src/tileset.cpp")
         .file("./src/shp23dtile.cpp")
         .file("./src/osgb23dtile.cpp")
@@ -45,7 +45,7 @@ fn build_linux_unkonw() {
         .compile("_3dtile");
     // -------------
     println!("cargo:rustc-link-search=native=/usr/lib/x86_64-linux-gnu");
-    println!("cargo:rustc-link-search=native=./vcpkg/installed/x64-linux/lib");
+    println!("cargo:rustc-link-search=native=./vcpkg/installed/x64-linux-release/lib");
     // -------------
     println!("cargo:rustc-link-lib=osg");
     println!("cargo:rustc-link-lib=osgDB");