Use bool type.

[android-x86/external-exfat.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 14bd10e..3f96db3 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -2,7 +2,7 @@
 #      SConstruct (10.09.09)
 #      SConscript for all components.
 #
-#      Copyright (C) 2009, 2010  Andrew Nayenko
+#      Copyright (C) 2010-2012  Andrew Nayenko
 #
 #      This program is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ conf = Configure(env)
 destdir = env.get('DESTDIR', '/sbin');
 targets = []
 libs = ['exfat']
+libfuse = 'fuse'
 
 if 'CC' in os.environ:
        conf.env.Replace(CC = os.environ['CC'])
@@ -36,23 +37,32 @@ if 'CCFLAGS' in os.environ:
 # Set default CCFLAGS for known compilers
 if not conf.env['CCFLAGS']:
        if conf.env['CC'] == 'gcc':
-               conf.env.Replace(CCFLAGS = '-Wall -O2 -ggdb')
+               conf.env.Replace(CCFLAGS = '-Wall -O2 -ggdb -std=c99')
        elif conf.env['CC'] == 'clang':
-               conf.env.Replace(CCFLAGS = '-Wall -O2 -g')
-conf.env.Append(CPPDEFINES = {'FUSE_USE_VERSION': 26})
+               conf.env.Replace(CCFLAGS = '-Wall -O2 -g -std=c99')
+if 'CPPFLAGS' in os.environ:
+       conf.env.Replace(CPPFLAGS = os.environ['CPPFLAGS'])
 conf.env.Append(CPPDEFINES = {'_FILE_OFFSET_BITS' : 64})
 conf.env.Append(CPPPATH = ['libexfat'])
 if 'LDFLAGS' in os.environ:
        conf.env.Append(LINKFLAGS = os.environ['LDFLAGS'])
 conf.env.Append(LIBPATH = ['libexfat'])
 
-# __DARWIN_64_BIT_INO_T=0 define is needed because since Snow Leopard inode
-# numbers are 64-bit by default, but libfuse operates 32-bit ones. This define
-# forces 32-bit inode declaration in system headers, but it's also possible to
-# link against libfuse_ino64 instead.
+# GNU/Linux requires _BSD_SOURCE define for vsyslog(), _XOPEN_SOURCE >= 500 for
+# pread(), pwrite(), snprintf(), strdup(), etc. Everything needed is enabled by
+# _GNU_SOURCE.
+if platform.system() == 'Linux':
+       conf.env.Append(CPPDEFINES = '_GNU_SOURCE');
+
+# Use 64-bit inode numbers (introduced in Mac OS X 10.5 Leopard). Require
+# OSXFUSE (http://osxfuse.github.com).
 if platform.system() == 'Darwin':
-       conf.env.Append(CPPDEFINES = {'__DARWIN_64_BIT_INO_T' : 0})
+       conf.env.Append(CPPDEFINES = '_DARWIN_USE_64_BIT_INODE')
        conf.env.Append(CPPDEFINES = {'__DARWIN_UNIX03' : 1})
+       conf.env.Append(CPPPATH = ['/usr/local/include/osxfuse'])
+       conf.env.Append(CFLAGS    = '-mmacosx-version-min=10.5')
+       conf.env.Append(LINKFLAGS = '-mmacosx-version-min=10.5')
+       libfuse = 'osxfuse_i64'
 
 # FreeBSD does not support block devices, only raw devices. Ublio is required
 # for unaligned I/O and caching.
@@ -92,7 +102,7 @@ def program(pattern, output, alias, libs):
 
 env.Library('libexfat/exfat', Glob('libexfat/*.c'))
 
-program('fuse/*.c', 'fuse/mount.exfat-fuse', 'mount.exfat', [libs + ['fuse']])
+program('fuse/*.c', 'fuse/mount.exfat-fuse', 'mount.exfat', [libs + [libfuse]])
 program('dump/*.c', 'dump/dumpexfat', None, libs)
 program('fsck/*.c', 'fsck/exfatfsck', 'fsck.exfat', libs)
 program('mkfs/*.c', 'mkfs/mkexfatfs', 'mkfs.exfat', libs)