diff --git a/.travis.yml b/.travis.yml index 6b10bcc..b7b8f24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,24 +14,33 @@ addons: packages: - g++-4.9 - expect - - binutils-mingw-w64-i686 + - binutils-mingw-w64-i686 # 32bit MinGW - gcc-mingw-w64-i686 - g++-mingw-w64-i686 + - binutils-mingw-w64-x86-64 # 64bit MinGW + - gcc-mingw-w64-x86-64 + - g++-mingw-w64-x86-64 matrix: include: - os: linux env: CONF=release BUILDER=gcc TARGET=Linux TAG=Linux + compiler: gcc - os: linux env: CONF=debug BUILDER=clang TARGET=Linux + compiler: clang - os: linux env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw + compiler: gcc - os: linux env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p + compiler: gcc - os: osx env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs + compiler: clang - os: osx env: CONF=release BUILDER=clang TARGET=IOs TAG=IOs + compiler: clang install: - cd .. diff --git a/lutin/z_target/lutinTarget_Windows.py b/lutin/z_target/lutinTarget_Windows.py index 6ff3fb5..1d82322 100644 --- a/lutin/z_target/lutinTarget_Windows.py +++ b/lutin/z_target/lutinTarget_Windows.py @@ -39,24 +39,17 @@ class Target(target.Target): sys.path.append("c:\\MinGW\\bin" ) os.environ['PATH'] += ";c:\\MinGW\\bin\\" else: - #if self.config["bus-size"] == "64": - # # 64 bits - # self.set_cross_base("x86_64-w64-mingw32-") - #else: - # # 32 bits - # self.set_cross_base("i686-w64-mingw32-") - # Only one ... need understand why - self.set_cross_base("i686-w64-mingw32-") + if self.config["bus-size"] == "64": + # 64 bits + self.set_cross_base("x86_64-w64-mingw32-") + else: + # 32 bits + self.set_cross_base("i686-w64-mingw32-") # force static link to prenvent many errors ... self.global_flags_ld.append(["-static-libgcc", "-static-libstdc++", "-static"]) - #self.path_bin="" - #self.path_lib="lib" - #self.path_data="data" - #self.path_doc="doc" - self.pkg_path_data = "data" self.pkg_path_bin = "" self.pkg_path_lib = "lib"