Revert "tweaks to mingw build environment"
This reverts commit fa09121a7f
.
This commit is contained in:
parent
fa09121a7f
commit
555174d510
@ -5,12 +5,12 @@ BASE=$(dirname $BASE) # up one
|
||||
BASE=$(dirname $BASE) # up one more
|
||||
BASE=$(dirname $BASE) # up one more
|
||||
|
||||
HOST=i686-w64-mingw32
|
||||
HOST=i686-pc-mingw32
|
||||
MINGW_ROOT=/usr/$HOST/sys-root/mingw
|
||||
|
||||
export PKG_CONFIG_PREFIX=$MINGW_ROOT
|
||||
export PKG_CONFIG_LIBDIR=$MINGW_ROOT/lib/pkgconfig
|
||||
export PKGCONFIG=pkg-config
|
||||
export PKGCONFIG=mingw32-pkg-config
|
||||
export AR=$HOST-ar
|
||||
export RANLIB=$HOST-ranlib
|
||||
export CC=$HOST-gcc
|
||||
|
14
wscript
14
wscript
@ -590,6 +590,13 @@ def configure(conf):
|
||||
|
||||
autowaf.check_header(conf, 'cxx', 'jack/session.h', define="JACK_SESSION", mandatory = False)
|
||||
|
||||
conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
|
||||
execute = "1",
|
||||
mandatory = True,
|
||||
msg = 'Checking for boost library >= 1.39',
|
||||
okmsg = 'ok',
|
||||
errmsg = 'too old\nPlease install boost version 1.39 or higher.')
|
||||
|
||||
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
|
||||
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2')
|
||||
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0')
|
||||
@ -614,13 +621,6 @@ def configure(conf):
|
||||
if Options.options.dist_target != 'mingw':
|
||||
conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
|
||||
|
||||
conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
|
||||
execute = "1",
|
||||
mandatory = True,
|
||||
msg = 'Checking for boost library >= 1.39',
|
||||
okmsg = 'ok',
|
||||
errmsg = 'too old\nPlease install boost version 1.39 or higher.')
|
||||
|
||||
# Tell everyone that this is a waf build
|
||||
|
||||
conf.env.append_value('CFLAGS', '-DWAF_BUILD')
|
||||
|
Loading…
Reference in New Issue
Block a user