$NetBSD$ --- SConstruct.orig 2009-06-17 18:50:19.000000000 +0000 +++ SConstruct @@ -62,7 +62,7 @@ if PLATFORM == 'darwin': PLUGIN_EXT = '.scx' DEFAULT_AUDIO_API = 'coreaudio' DEFAULT_PREFIX = '/usr/local' -elif PLATFORM == 'freebsd': +elif PLATFORM == 'freebsd' or PLATFORM == 'netbsd': PLATFORM_SYMBOL = 'SC_FREEBSD' PLUGIN_EXT = '.so' DEFAULT_AUDIO_API = 'jack' @@ -289,7 +289,7 @@ opts.AddOptions( BoolOption('DEBUG', 'Build with debugging information', 0), PathOption('DESTDIR', - 'Intermediate installation prefix for packaging', '/'), + 'Intermediate installation prefix for packaging', '/', PathOption.PathIsDirCreate), BoolOption('DEVELOPMENT', 'Build and install the development files', 0), BoolOption('FFTW', @@ -741,7 +741,7 @@ libscsynthEnv = serverEnv.Clone( # platform specific # functionality of libdl is included in libc on freebsd -if PLATFORM == 'freebsd': +if PLATFORM == 'freebsd' or PLATFORM == 'netbsd': serverEnv.Append(LIBS = ['common', 'pthread']) else: serverEnv.Append(LIBS = ['common', 'pthread', 'dl']) @@ -751,7 +751,7 @@ if PLATFORM == 'darwin': LINKFLAGS = [ '-framework', 'CoreServices']) #'-dylib_install_name', FINAL_PREFIX + '/lib/libsclang.dylib']) -elif PLATFORM == 'linux': +elif PLATFORM == 'linux' or PLATFORM == 'netbsd': serverEnv.Append( CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')], LINKFLAGS = '-Wl,-rpath,' + FINAL_PREFIX + '/lib') @@ -808,7 +808,7 @@ libscsynthStaticSources = libscsynthSour libscsynthStatic = serverEnv.StaticLibrary('build/scsynth', libscsynthStaticSources) env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynthStatic])) -scsynth = serverEnv.Program('build/scsynth', scsynthSources, LIBS = ['scsynth']) +scsynth = serverEnv.Program('build/scsynth', scsynthSources, LIBS = ['scsynth'] + serverEnv['LIBS']) env.Alias('install-programs', env.Install(bin_dir(INSTALL_PREFIX), [scsynth])) # ====================================================================== @@ -834,7 +834,7 @@ pluginEnv.Append( if PLATFORM == 'darwin': pluginEnv['SHLINKFLAGS'] = '$LINKFLAGS -bundle -flat_namespace -undefined suppress' -if PLATFORM == 'freebsd': +if PLATFORM == 'freebsd' or PLATFORM == 'netbsd': merge_lib_info( pluginEnv, libraries['sndfile']) @@ -972,7 +972,7 @@ if env.has_key('amd64') and env['amd64'] langEnv.Append( CXXFLAGS = ['-m32'] ) # functionality of libdl is included in libc on freebsd -if PLATFORM == 'freebsd': +if PLATFORM == 'freebsd' or PLATFORM == 'netbsd': langEnv.Append(LIBS = ['common', 'scsynth', 'pthread', 'm']) else: langEnv.Append(LIBS = ['common', 'scsynth', 'pthread', 'dl', 'm']) @@ -985,7 +985,7 @@ if PLATFORM == 'darwin': elif PLATFORM == 'linux': langEnv.Append( LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib') -elif PLATFORM == 'freebsd': +elif PLATFORM == 'freebsd' or PLATFORM == 'netbsd': langEnv.Append( LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib') @@ -1038,6 +1038,7 @@ Source/lang/LangPrimSource/PyrSched.cpp Source/lang/LangPrimSource/PyrPrimitive.cpp Source/lang/LangPrimSource/PyrMathPrim.cpp Source/lang/LangPrimSource/SC_ComPort.cpp +Source/lang/LangPrimSource/SC_HID.cpp Source/lang/LangPrimSource/OSCData.cpp Source/lang/LangPrimSource/PyrArchiver.cpp Source/lang/LangPrimSource/PyrArrayPrimitives.cpp @@ -1071,7 +1072,6 @@ if PLATFORM == 'darwin': LINKFLAGS = '-framework Carbon -framework IOKit -framework IOBluetooth' ) libsclangSources += Split(''' -Source/lang/LangPrimSource/SC_HID.cpp Source/lang/LangPrimSource/SC_CoreAudioPrim.cpp Source/lang/LangPrimSource/HID_Utilities/HID_Error_Handler.c Source/lang/LangPrimSource/HID_Utilities/HID_Name_Lookup.c @@ -1099,10 +1099,7 @@ sclangSources = ['Source/lang/LangSource if env['LANG']: libsclang = langEnv.SharedLibrary('build/sclang', libsclangSources) env.Alias('install-bin', env.Install(lib_dir(INSTALL_PREFIX), [libsclang])) - if PLATFORM == 'darwin': - sclangLibs = ['scsynth', 'sclang'] - else: - sclangLibs = ['sclang'] + sclangLibs = ['scsynth', 'sclang'] + langEnv['LIBS'] sclang = langEnv.Program('build/sclang', sclangSources, LIBS=sclangLibs) env.Alias('install-programs', env.Install(bin_dir(INSTALL_PREFIX), [sclang]))