diff --git a/3rdparty/libogg/wscript b/3rdparty/libogg/wscript index 2b825a13..1fba1d6e 100644 --- a/3rdparty/libogg/wscript +++ b/3rdparty/libogg/wscript @@ -1,21 +1,6 @@ #! /usr/bin/env python # encoding: utf-8 -FRAGMENT_INTTYPES_H='''#include -int main (int argc, char **argv) { - return 0; -}''' - -FRAGMENT_SYS_TYPES_H='''#include -int main (void) { - return 0; -}''' - -FRAGMENT_STDINT_H='''#include -int main (void) { - return 0; -}''' - def options(opt): pass @@ -25,11 +10,11 @@ def configure(conf): return # Check for required headers - if conf.check_cc(fragment=FRAGMENT_INTTYPES_H, msg = 'Checking for inttypes.h header', mandatory = False): + if conf.check_cc(header_name='inttypes.h', mandatory = False): conf.define('INCLUDE_INTTYPES_H', 1) - elif conf.check_cc(fragment=FRAGMENT_SYS_TYPES_H, msg = 'Checking for sys/types.h header', mandatory = False): + elif conf.check_cc(header_name='sys/types.h', mandatory = False): conf.define('INCLUDE_SYS_TYPES_H', 1) - elif conf.check_cc(fragmenmt=FRAGMENT_STDINT_H, msg = 'Checking for stdint.h header', mandatory = False): + elif conf.check_cc(header_name='stdint.h', mandatory = False): conf.define('INCLUDE_STDINT_H', 1) @@ -42,7 +27,6 @@ def build(bld): bld.stlib( source = sources, target = 'libogg', - features = 'c', includes = includes, export_includes = ['libogg/include/'] ) diff --git a/3rdparty/opusfile/wscript b/3rdparty/opusfile/wscript index 835b4e1f..e758e0e8 100644 --- a/3rdparty/opusfile/wscript +++ b/3rdparty/opusfile/wscript @@ -25,8 +25,7 @@ def build(bld): bld.stlib( source = sources, target = 'libopusfile', - features = 'c', includes = ['opusfile/include/'], - use = ['libogg', 'opus'], + use = ['libogg', 'opus'], export_includes = ['opusfile/include/'] )