2013-09-26 17:14:40 +02:00

51 lines
1.9 KiB
Plaintext
Raw Permalink Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

$NetBSD: patch-aa,v 1.4 2013/02/16 11:21:25 wiz Exp $
NetBSD config & path fixes
--- SConstruct.orig 2010-03-18 15:34:15.000000000 +0200
+++ SConstruct 2011-01-19 20:02:53.000000000 +0200
@@ -19,7 +19,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-import sys, os
+import sys, os, re
import SCons.Util
pingus_sources = [
@@ -348,7 +348,10 @@
opts.Add(BoolVariable('with_xinput', 'Build with Xinput support', False))
opts.Add(BoolVariable('with_linuxusbmouse', 'Build with Linux USB mouse support', True))
- opts.Add(BoolVariable('with_linuxevdev', 'Build with Linux evdev support', True))
+ if sys.platform == 'linux':
+ opts.Add(BoolVariable('with_linuxevdev', 'Build with Linux evdev support', True))
+ else:
+ opts.Add(BoolVariable('with_linuxevdev', 'Build with Linux evdev support', False))
opts.Add(BoolVariable('with_wiimote', 'Build with Wiimote support', False))
opts.Add(BoolVariable('ignore_errors', 'Ignore any fatal configuration errors', False))
opts.Add('optional_sources', 'Additional source files', [])
@@ -383,7 +386,10 @@
return 0;
}
"""
- config.CheckLibWithHeader('iconv', 'iconv.h', 'c++') # Ok to fail
+ if re.match("netbsd*", sys.platform):
+ config.CheckLibWithHeader('iconv_std', 'iconv.h', 'c++')
+ else:
+ config.CheckLibWithHeader('iconv', 'iconv.h', 'c++') # Ok to fail
context.Message('Check how to call iconv...')
for i in ['', 'const']:
@@ -539,7 +545,9 @@
Help(opts.GenerateHelpText(env))
opts.Update(env)
- env['CPPPATH'] += ['.', 'src/']
+ env['CPPPATH'] += ['.', 'src/', 'BUILDLINK_DIR/include']
+ env['LIBPATH'] += ['BUILDLINK_DIR/lib', '/usr/lib/i18n']
+ env['ENV']['PATH'] = os.environ['PATH']
Default(env.Program('pingus', pingus_sources + env['optional_sources']))
Clean('pingus', ['config.py', 'config.h'])