From 5389062d4436c70ce92cb85d12ee5c8d0ff2211d Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Thu, 4 Jul 2019 01:51:27 -0400 Subject: [PATCH] tycho: use cargo to link libraries --- tycho/CMakeLists.txt | 2 +- tycho/build.rs | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tycho/CMakeLists.txt b/tycho/CMakeLists.txt index e631214..564ad39 100644 --- a/tycho/CMakeLists.txt +++ b/tycho/CMakeLists.txt @@ -24,7 +24,7 @@ find_package( add_library( maraiah-tycho-hermes - SHARED + STATIC $ENV{OUT_DIR}/bindings.cc $ENV{OUT_DIR}/bindings.h cc/interface.h diff --git a/tycho/build.rs b/tycho/build.rs index 8ed3967..9339642 100644 --- a/tycho/build.rs +++ b/tycho/build.rs @@ -19,10 +19,15 @@ fn main() config.cxxflag("-DTYCHO_DEBUG_ASSERTIONS"); } - let destination = config.build(); + let out_dir = config.build(); + let lib_dir = out_dir.join("lib"); - println!("cargo:rustc-link-search=native={}/lib", destination.display()); - println!("cargo:rustc-link-lib=dylib=maraiah-tycho-hermes"); + println!("cargo:rustc-link-search=native={}", lib_dir.display()); + println!("cargo:rustc-link-lib=static=maraiah-tycho-hermes"); + println!("cargo:rustc-link-lib=dylib=Qt5Core"); + println!("cargo:rustc-link-lib=dylib=Qt5Widgets"); + println!("cargo:rustc-link-lib=dylib=Qt5Gui"); + println!("cargo:rustc-link-lib=dylib=stdc++"); } // EOF