fix build on windows and use travis right

Author: Speedy37

.travis.yml

@@ -1,28 +1,33 @@
-dist: trusty
-sudo: require
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-6
-      - g++-6
-      - cmake
-
 language: rust
 
-cache: cargo
+sudo: required
 
 rust:
   - stable
+  - beta
   - nightly
 
+os:
+  - windows
+  - linux
+  - osx
+
 matrix:
   allow_failures:
     - rust: nightly
-  fast_finish: true
+
+addons:
+  apt:
+    packages:
+      - cmake
+      - gcc
+
+language: rust
+
+cache: cargo
 
 script:
-  - cargo test --all
-  - cargo test --all --features no_secure
+  - cargo test --verbose --all
+  - cargo test --verbose --all --no-default-features
+  - cargo test --release --verbose --all
+  - cargo test --release --verbose --all --no-default-features

Cargo.toml

@@ -10,6 +10,9 @@ description = "Performance and security oriented drop-in allocator"
 license = "MIT"
 readme = "README.md"
 
+[workspace]
+members = ["libmimalloc-sys" ]
+
 [badges]
 travis-ci = { repository = "purpleprotocol/mimalloc_rust" }
 

libmimalloc-sys/build.rs

@@ -1,32 +1,47 @@
 use cmake::Config;
 
-#[cfg(not(feature = "secure"))]
 fn main() {
-    let mut dst = Config::new("c_src/mimalloc")    
-        .build();
+    let mut cfg = &mut Config::new("c_src/mimalloc");
 
-    dst.push("build");
+    cfg = cfg.define("MI_OVERRIDE", "OFF");
 
-    println!("cargo:rustc-link-search=native={}", dst.display());
-    if cfg!(debug_assertions) {
-        println!("cargo:rustc-link-lib=static=mimalloc-debug");
-    } else {
-        println!("cargo:rustc-link-lib=static=mimalloc");
+    if cfg!(feature = "secure") {
+        cfg = cfg.define("MI_SECURE", "OFF");
     }
-}
 
-#[cfg(feature = "secure")]
-fn main() {
-    let mut dst = Config::new("c_src/mimalloc")
-        .define("SECURE", "ON")    
-        .build();
+    if cfg!(all(windows, target_env = "msvc")) {
+        // cc::get_compiler have /nologo /MD default flags that are cmake::Config
+        // defaults to. Those flags prevents mimalloc from building on windows
+        // extracted from default cmake configuration on windows
+        if cfg!(debug_assertions) {
+            // CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG
+            cfg = cfg.cflag("/DWIN32 /D_WINDOWS /W3 /MDd /Zi /Ob0 /Od /RTC1");
+        } else {
+            // CMAKE_C_FLAGS + CMAKE_C_FLAGS_RELEASE
+            cfg = cfg.cflag("/DWIN32 /D_WINDOWS /W3 /MD /O2 /Ob2 /DNDEBUG");
+        }
+    }
 
-    dst.push("build");
-    
-    println!("cargo:rustc-link-search=native={}", dst.display());
-    if cfg!(debug_assertions) {
-        println!("cargo:rustc-link-lib=static=mimalloc-debug");
+    let (out_dir, out_name) = if cfg!(all(windows, target_env = "msvc")) {
+        if cfg!(debug_assertions) {
+            ("./build/Debug", "mimalloc-static-debug")
+        } else {
+            ("./build/Release", "mimalloc-static")
+        }
     } else {
-        println!("cargo:rustc-link-lib=static=mimalloc-secure");
-    }
-}
+        if cfg!(debug_assertions) {
+            ("./build", "mimalloc-debug")
+        } else if cfg!(feature = "secure") {
+            ("./build", "mimalloc")
+        } else {
+            ("./build", "mimalloc")
+        }
+    };
+
+    // Build mimalloc-static
+    let mut dst = cfg.build_target("mimalloc-static").build();
+    dst.push(out_dir);
+
+    println!("cargo:rustc-link-search=native={}", dst.display());
+    println!("cargo:rustc-link-lib={}", out_name);
+}