diff --git a/.gitignore b/.gitignore index 03ae2b5f..10dc010a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,14 +18,3 @@ codeBlocks # common release files /destdir/ - -# macos release files -/macos/package.xml -/macos/package-welcome.txt - -# windows release files -/innosetup/ -/is.exe -/windows/inno/version.iss -/windows/inno/win32 -/windows/inno/win64 diff --git a/dbus/wscript b/dbus/wscript index 80f011c7..7bc016ee 100644 --- a/dbus/wscript +++ b/dbus/wscript @@ -62,8 +62,6 @@ def build(bld): sysdeps_dbus_include = ['../linux', '../posix'] if bld.env['IS_FREEBSD']: sysdeps_dbus_include = ['../freebsd', '../posix'] - if bld.env['IS_MACOSX']: - sysdeps_dbus_include = ['../macosx', '../posix'] obj.includes = sysdeps_dbus_include + ['.', '../', '../common', '../common/jack'] @@ -94,11 +92,6 @@ def build(bld): '../linux/uptime.c', ] obj.use += ['PTHREAD', 'EXECINFO', 'LIBSYSINFO', 'DBUS-1', 'EXPAT'] - if bld.env['IS_MACOSX']: - obj.source += [ - '../macosx/uptime.c', - ] - obj.use += ['PTHREAD', 'DL', 'DBUS-1', 'EXPAT'] if bld.env['BUILD_SIGINFO']: obj.source += [ 'siginfo.c', diff --git a/wscript b/wscript index 07ddc82c..0da59d6b 100644 --- a/wscript +++ b/wscript @@ -93,9 +93,7 @@ def detect_platform(conf): # ('KEY, 'Human readable name', ['strings', 'to', 'check', 'for']) ('IS_LINUX', 'Linux', ['gnu0', 'gnukfreebsd', 'linux', 'posix']), ('IS_FREEBSD', 'FreeBSD', ['freebsd']), - ('IS_MACOSX', 'MacOS X', ['darwin']), ('IS_SUN', 'SunOS', ['sunos']), - ('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32']) ] for key, name, strings in platforms: