Merge pull request #3 from DenisKolodin/git-submodule

Add nativefiledialog as a git submodule

Author: saurvs

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "nativefiledialog"]
+	path = nativefiledialog
+	url = https://github.com/mlabbe/nativefiledialog
+	branch = master

Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "nfd"
-version = "0.0.2"
-authors = ["Saurav Sachidanand <[email protected]>", "Daniel Collin <daniel@collin>"]
+version = "0.0.3"
+authors = [
+	"Saurav Sachidanand <[email protected]>",
+	"Daniel Collin <[email protected]>",
+	"Denis Kolodin <[email protected]>",
+]
 
 license = "MIT"
 repository = "https://www.github.com/saurvs/nfd-rs"

appveyor.yml

@@ -0,0 +1,24 @@
+environment:
+  matrix:
+    - TARGET: x86_64-pc-windows-gnu
+      MSYS_BITS: 64
+    - TARGET: i686-pc-windows-gnu
+      MSYS_BITS: 32
+    - TARGET: x86_64-pc-windows-msvc
+    - TARGET: i686-pc-windows-msvc
+
+install:
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
+  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+  - set PATH=%PATH%;C:\Program Files (x86)\Rust\bin
+  - if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
+  - set CARGO_TARGET_DIR=%APPVEYOR_BUILD_FOLDER%\target
+  - rustc -V
+  - cargo -V
+
+build: false
+
+test_script:
+  - git submodule update --init --recursive
+  - cargo build --verbose
+  - cargo test --verbose

build.rs

@@ -24,18 +24,25 @@ extern crate gcc;
 use std::env;
 use std::process::Command;
 
+macro_rules! nfd {
+    ($suf:expr) => {
+        concat!("nativefiledialog/src/", $suf);
+    };
+}
+
 fn main() {
     let mut cfg = gcc::Config::new();
     let env = env::var("TARGET").unwrap();
 
-    cfg.file("nfd/src/nfd_common.c");
+    cfg.include(nfd!("include"));
+    cfg.file(nfd!("nfd_common.c"));
 
     if env.contains("darwin") {
-        cfg.file("nfd/src/nfd_cocoa.m");
+        cfg.file(nfd!("nfd_cocoa.m"));
         cfg.compile("libnfd.a");
         println!("cargo:rustc-link-lib=framework=AppKit");
     } else if env.contains("windows") {
-        cfg.file("nfd/src/nfd_win.cpp");
+        cfg.file(nfd!("nfd_win.cpp"));
         cfg.compile("libnfd.a");
         println!("cargo:rustc-link-lib=ole32");
         // MinGW doesn't link it by default
@@ -60,7 +67,7 @@ fn main() {
             }
             _ => (),
         }
-        cfg.file("nfd/src/nfd_gtk.c");
+        cfg.file(nfd!("nfd_gtk.c"));
         cfg.compile("libnfd.a");
         println!("cargo:rustc-link-lib=gdk-3");
         println!("cargo:rustc-link-lib=gtk-3");