some C++-ification of GnomeCanvasBlah

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index f927abdd7ed91cd8b775dcef8c51f0ec039dbda1..d6ac933acb95750e4e94bc91e52fb1390504019d 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -16,16 +16,20 @@ domain = 'gtk_ardour'
 
 gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2)
 gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
-gtkardour.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
 gtkardour.Append(PACKAGE=domain)
 gtkardour.Append(POTFILE=domain + '.pot')
 
 gtkardour.Merge ([
     libraries['ardour'],
     libraries['gtkmm2ext'],
+    libraries['flowcanvas'],
     libraries['midi++2'],
     libraries['pbd3'],
     libraries['gtkmm2'],
+    libraries['glib2'],
+    libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
     libraries['sysmidi'],
     libraries['sndfile'],
@@ -36,10 +40,8 @@ gtkardour.Merge ([
     libraries['gdkmm2'],
     libraries['sigc2'],
     libraries['gtk2'],
-    libraries['libgnomecanvas2'],
     libraries['xml'],
     libraries['soundtouch'],
-    libraries['raptor'],
     libraries['samplerate'],
     libraries['jack']
 ])
@@ -47,8 +49,13 @@ gtkardour.Merge ([
 if gtkardour['VST']:
     gtkardour.Merge ([ libraries['fst']])
 
+skipped_files=Split("""
+connection_editor.cc
+""")
+
 gtkardour_files=Split("""
 about.cc
+actions.cc
 add_route_dialog.cc
 ardour_dialog.cc
 ardour_message.cc
@@ -65,12 +72,12 @@ automation_line.cc
 automation_pan_line.cc
 automation_time_axis.cc
 axis_view.cc
-canvas-imageframe.cc
-canvas-ruler.c
+canvas-imageframe.c
 canvas-simpleline.c
+simpleline.cc
 canvas-simplerect.c
+simplerect.cc
 canvas-waveview.c
-connection_editor.cc
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
@@ -114,7 +121,6 @@ imageframe_view.cc
 io_selector.cc
 keyboard.cc
 keyboard_target.cc
-library_ui.cc
 location_ui.cc
 main.cc
 marker.cc
@@ -147,6 +153,7 @@ route_params_ui.cc
 route_redirect_selection.cc
 route_ui.cc
 selection.cc
+sfdb_ui.cc
 send_ui.cc
 streamview.cc
 tempo_dialog.cc
@@ -162,6 +169,10 @@ mtest_files=Split("""
 mtest.cc
 """)
 
+itest_files=Split("""
+itest.cc
+""")
+
 extra_sources = []
 vst_files = [ 'vst_pluginui.cc' ]
 
@@ -182,6 +193,7 @@ executable = 'ardour.bin'
 
 ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources)
 mtest = gtkardour.Program(target = 'mtest', source = mtest_files)
+itest = gtkardour.Program(target = 'itest', source = itest_files)
 
 Default(ardour)