config issues

Author: ssrlive

.cargo/config.toml

@@ -0,0 +1,6 @@
+[build]
+# target = ["x86_64-unknown-linux-gnu"]
+# target = ["aarch64-linux-android"]
+# target = ["aarch64-apple-ios"]
+# target = ["x86_64-pc-windows-msvc"]
+# target = ["x86_64-apple-darwin"]

.github/workflows/publish-exe.yml

@@ -63,7 +63,7 @@ jobs:
           else
             cargo build --all-features --release --target ${{ matrix.target }}
           fi
-          cbindgen --config cbindgen.toml -l C -o target/dns2socks-ffi.h
+          cbindgen --config cbindgen.toml -o target/dns2socks-ffi.h
           if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then
             powershell -Command "(Get-Item README.md).LastWriteTime = Get-Date"
             powershell Compress-Archive -Path target/${{ matrix.target }}/release/dns2socks.exe, README.md, target/dns2socks-ffi.h, target/${{ matrix.target }}/release/dns2socks.dll -DestinationPath mypubdir4/dns2socks-${{ matrix.target }}.zip

build-aarch64-apple-ios-debug.sh

@@ -10,11 +10,10 @@ cargo build --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/dns2socks.h
+cbindgen --config cbindgen.toml -o target/include/dns2socks.h
 cat > target/include/dns2socks.modulemap <<EOF
 framework module dns2socks {
     umbrella header "dns2socks.h"
-
     export *
     module * { export * }
 }

build-aarch64-apple-ios.sh

@@ -10,11 +10,10 @@ cargo build --release --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/dns2socks.h
+cbindgen --config cbindgen.toml -o target/include/dns2socks.h
 cat > target/include/dns2socks.modulemap <<EOF
 framework module dns2socks {
     umbrella header "dns2socks.h"
-
     export *
     module * { export * }
 }

build-apple.sh

@@ -24,7 +24,7 @@ cargo build --release --target aarch64-apple-ios-sim
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/dns2socks.h
+cbindgen --config cbindgen.toml -o target/include/dns2socks.h
 cat > target/include/dns2socks.modulemap <<EOF
 framework module dns2socks {
     umbrella header "dns2socks.h"

cbindgen.toml

@@ -1,3 +1,6 @@
+language = "C"
+cpp_compat = true
+
 [export]
 include = ["dns2socks_start", "dns2socks_stop", "dns2socks_set_log_callback"]
 exclude = []