[CI] set minGW builder better
This commit is contained in:
parent
75d1490a59
commit
b497e09dd0
11
.travis.yml
11
.travis.yml
@ -14,24 +14,33 @@ addons:
|
|||||||
packages:
|
packages:
|
||||||
- g++-4.9
|
- g++-4.9
|
||||||
- expect
|
- expect
|
||||||
- binutils-mingw-w64-i686
|
- binutils-mingw-w64-i686 # 32bit MinGW
|
||||||
- gcc-mingw-w64-i686
|
- gcc-mingw-w64-i686
|
||||||
- g++-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:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
- os: linux
|
||||||
env: CONF=release BUILDER=gcc TARGET=Linux TAG=Linux
|
env: CONF=release BUILDER=gcc TARGET=Linux TAG=Linux
|
||||||
|
compiler: gcc
|
||||||
- os: linux
|
- os: linux
|
||||||
env: CONF=debug BUILDER=clang TARGET=Linux
|
env: CONF=debug BUILDER=clang TARGET=Linux
|
||||||
|
compiler: clang
|
||||||
- os: linux
|
- os: linux
|
||||||
env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw
|
env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw
|
||||||
|
compiler: gcc
|
||||||
- os: linux
|
- os: linux
|
||||||
env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p
|
env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p
|
||||||
|
compiler: gcc
|
||||||
- os: osx
|
- os: osx
|
||||||
env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs
|
env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs
|
||||||
|
compiler: clang
|
||||||
- os: osx
|
- os: osx
|
||||||
env: CONF=release BUILDER=clang TARGET=IOs TAG=IOs
|
env: CONF=release BUILDER=clang TARGET=IOs TAG=IOs
|
||||||
|
compiler: clang
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- cd ..
|
- cd ..
|
||||||
|
@ -39,24 +39,17 @@ class Target(target.Target):
|
|||||||
sys.path.append("c:\\MinGW\\bin" )
|
sys.path.append("c:\\MinGW\\bin" )
|
||||||
os.environ['PATH'] += ";c:\\MinGW\\bin\\"
|
os.environ['PATH'] += ";c:\\MinGW\\bin\\"
|
||||||
else:
|
else:
|
||||||
#if self.config["bus-size"] == "64":
|
if self.config["bus-size"] == "64":
|
||||||
# # 64 bits
|
# 64 bits
|
||||||
# self.set_cross_base("x86_64-w64-mingw32-")
|
self.set_cross_base("x86_64-w64-mingw32-")
|
||||||
#else:
|
else:
|
||||||
# # 32 bits
|
# 32 bits
|
||||||
# self.set_cross_base("i686-w64-mingw32-")
|
self.set_cross_base("i686-w64-mingw32-")
|
||||||
# Only one ... need understand why
|
|
||||||
self.set_cross_base("i686-w64-mingw32-")
|
|
||||||
# force static link to prenvent many errors ...
|
# force static link to prenvent many errors ...
|
||||||
self.global_flags_ld.append(["-static-libgcc",
|
self.global_flags_ld.append(["-static-libgcc",
|
||||||
"-static-libstdc++",
|
"-static-libstdc++",
|
||||||
"-static"])
|
"-static"])
|
||||||
|
|
||||||
#self.path_bin=""
|
|
||||||
#self.path_lib="lib"
|
|
||||||
#self.path_data="data"
|
|
||||||
#self.path_doc="doc"
|
|
||||||
|
|
||||||
self.pkg_path_data = "data"
|
self.pkg_path_data = "data"
|
||||||
self.pkg_path_bin = ""
|
self.pkg_path_bin = ""
|
||||||
self.pkg_path_lib = "lib"
|
self.pkg_path_lib = "lib"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user