summaryrefslogtreecommitdiff
path: root/libs/midi++2
diff options
context:
space:
mode:
authorTaybin Rutkin <taybin@taybin.com>2006-04-25 20:23:50 +0000
committerTaybin Rutkin <taybin@taybin.com>2006-04-25 20:23:50 +0000
commit49ab3aa0b3e78b635c22512b30f44b951c1401f7 (patch)
treea1380f163eb95d1e62698a919a451cc0892c1a80 /libs/midi++2
parentbc46c6e5d44de56a8ef290484766a0f3bcfbed65 (diff)
All included libraries now link dynamically instead of statically.
Moved items from gtk2_ardour/utils to pbd3/convert. Various cleanups. git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
-rw-r--r--libs/midi++2/.cvsignore2
-rw-r--r--libs/midi++2/SConscript7
2 files changed, 5 insertions, 4 deletions
diff --git a/libs/midi++2/.cvsignore b/libs/midi++2/.cvsignore
index b1322ae10d..6f9bdf9452 100644
--- a/libs/midi++2/.cvsignore
+++ b/libs/midi++2/.cvsignore
@@ -1,3 +1,5 @@
libmidi++.pc
libmidi++.spec
version.cc
+*.os
+*.dylib
diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index fe02a8d059..d7fd531306 100644
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -35,6 +35,8 @@ coremidi_midiport.cc
if env['SYSMIDI'] == 'CoreMIDI':
sysdep_src = [ 'coremidi_midiport.cc' ]
midi2.Append (CCFLAGS="-DWITH_COREMIDI")
+ midi2.Append (LINKFLAGS="-framework CoreMIDI")
+ midi2.Append (LINKFLAGS="-framework CoreFoundation")
else:
sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
midi2.Append (CCFLAGS="-DWITH_ALSA")
@@ -44,10 +46,7 @@ midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
midi2.VersionBuild(['version.cc','midi++/version.h'], 'SConscript')
-if env['DEVBUILD']:
- libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
-else:
- libmidi2 = midi2.StaticLibrary('midi++', [ sources, sysdep_src ])
+libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
Default(libmidi2)