windows vcpkg

fanvanzh · May 22, 2024 · aae3479 · aae3479
1 parent 6100aeb
commit aae3479
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 # Introduction
 
 [![glTF status](https://img.shields.io/badge/glTF-2%2E0-green.svg?style=flat)](https://github.com/KhronosGroup/glTF)
-[![Action status](https://github.com/fanvanzh/3dtiles/actions/workflows/build.yml/badge.svg)](https://github.com/fanvanzh/3dtiles/actions/workflows/build.yml)
-
+[![Action status](https://github.com/fanvanzh/3dtiles/actions/workflows/windows.yml/badge.svg)](https://github.com/fanvanzh/3dtiles/actions/workflows/windows.yml)
+[![Action status](https://github.com/fanvanzh/3dtiles/actions/workflows/linux.yml/badge.svg)](https://github.com/fanvanzh/3dtiles/actions/workflows/linux.yml)
 Tools for 3D-Tiles convertion.
 
 This is a `RUST language` project with cpp lib to handle osgb data.

diff --git a/build.rs b/build.rs
@@ -1,6 +1,5 @@
 extern crate cc;
 use std::env;
-use std::process::{Command, Stdio};
 
 fn build_win_msvc() {
     cc::Build::new()

diff --git a/src/GeoTransform.h b/src/GeoTransform.h
@@ -1,6 +1,12 @@
 #pragma once
-#include <gdal/ogr_spatialref.h>
-#include <gdal/ogrsf_frmts.h>
+/* vcpkg path */
+#ifdef _WIN32
+    #include <ogr_spatialref.h>
+    #include <ogrsf_frmts.h>
+#else
+    #include <gdal/ogr_spatialref.h>
+    #include <gdal/ogrsf_frmts.h>
+#endif
 
 #include "glm/glm.hpp"
 

diff --git a/src/shp23dtile.cpp b/src/shp23dtile.cpp
@@ -3,7 +3,12 @@
 #include "json.hpp"
 #include "extern.h"
 
-#include <gdal/ogrsf_frmts.h>
+/* vcpkg path */
+#ifdef _WIN32
+    #include <ogrsf_frmts.h>
+#else
+    #include <gdal/ogrsf_frmts.h>
+#endif
 
 #include <osg/Material>
 #include <osg/PagedLOD>

diff --git a/src/tileset.cpp b/src/tileset.cpp
@@ -4,8 +4,14 @@
 #include <cstring>
 #include <algorithm>
 
-#include <gdal/ogrsf_frmts.h>
-#include <gdal/ogr_spatialref.h>
+/* vcpkg path */
+#ifdef _WIN32
+    #include <ogr_spatialref.h>
+    #include <ogrsf_frmts.h>
+#else
+    #include <gdal/ogrsf_frmts.h>
+    #include <gdal/ogr_spatialref.h>
+#endif
 
 #include "extern.h"
 #include "GeoTransform.h"