set compile and link options for x86

VOICEVOX · Jul 18, 2022 · 83f7eef · 83f7eef
1 parent 759181d
commit 83f7eef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/crates/open_jtalk-sys/Cargo.toml b/crates/open_jtalk-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "open_jtalk-sys"
-version = "0.10.111"
+version = "0.11.111"
 edition = "2021"
 
 [features]

diff --git a/crates/open_jtalk-sys/build.rs b/crates/open_jtalk-sys/build.rs
@@ -3,9 +3,7 @@ fn main() {
     let mut cmake_conf = cmake::Config::new("open_jtalk");
     let target = env::var("TARGET").unwrap();
     let cmake_conf = if target.starts_with("i686") {
-        cmake_conf
-            .define("CMAKE_CXX_FLAGS", "-m32")
-            .define("CMAKE_C_FLAGS", "-m32")
+        cmake_conf.define("OPEN_JTALK_X86", "true")
     } else {
         &mut cmake_conf
     };

diff --git a/crates/open_jtalk-sys/open_jtalk/CMakeLists.txt b/crates/open_jtalk-sys/open_jtalk/CMakeLists.txt
@@ -9,6 +9,12 @@ FetchContent_Declare(
   SOURCE_SUBDIR src)
 FetchContent_MakeAvailable(openjtalk)
 
+if(DEFINED OPEN_JTALK_X86)
+  set_target_properties(openjtalk PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS
+                                                                  "-m32")
+
+endif()
+
 install(TARGETS openjtalk LIBRARY DESTINATION lib)
 install(
   FILES

diff --git a/crates/open_jtalk/Cargo.toml b/crates/open_jtalk/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "open_jtalk"
-version = "0.1.19"
+version = "0.1.20"
 edition = "2021"
 
 [dependencies]
-open_jtalk-sys = { path = "../open_jtalk-sys", version = "0.10.111" }
+open_jtalk-sys = { path = "../open_jtalk-sys", version = "0.11.111" }
 thiserror = "1.0.31"
 
 [dev-dependencies]