Move 'round()' / 'trunc()' etc so that they won't conflict with any versions already...

[ardour.git] / MSVCardour3 / Ardour3.vcproj

diff --git a/MSVCardour3/Ardour3.vcproj b/MSVCardour3/Ardour3.vcproj
index 0dcec61c704397055432cc57342207bb9a38b253..9a32f1fccee66bae8cbd0f67d748e618bd175b70 100644 (file)
--- a/MSVCardour3/Ardour3.vcproj
+++ b/MSVCardour3/Ardour3.vcproj
@@ -319,10 +319,18 @@
                                RelativePath="..\gtk2_ardour\ardour_dropdown.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\ardour_http.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\ardour_knob.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\ardour_spinner.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\ardour_ui.cc"
                                >
@@ -419,6 +427,10 @@
                                RelativePath="..\gtk2_ardour\clock_group.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\color_theme_manager.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\configinfo.cc"
                                >
@@ -431,6 +443,10 @@
                                RelativePath="..\gtk2_ardour\control_point_dialog.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\control_slave_ui.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\cursor_context.cc"
                                >
@@ -811,10 +827,6 @@
                                RelativePath="..\gtk2_ardour\missing_plugin_dialog.cc"
                                >
                        </File>
-                       <File
-                               RelativePath="..\gtk2_ardour\mixer_actor.cc"
-                               >
-                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\mixer_group_tabs.cc"
                                >
@@ -1243,6 +1255,14 @@
                                RelativePath="..\gtk2_ardour\utils_videotl.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\vca_master_strip.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\vca_time_axis.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\verbose_cursor.cc"
                                >
@@ -1345,10 +1365,18 @@
                                RelativePath="..\gtk2_ardour\ardour_dropdown.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\ardour_http.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\ardour_knob.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\ardour_spinner.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\ardour_ui.h"
                                >
@@ -1441,6 +1469,10 @@
                                RelativePath="..\gtk2_ardour\color_aliases.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\color_theme_manager.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\configinfo.h"
                                >
@@ -1453,6 +1485,10 @@
                                RelativePath="..\gtk2_ardour\control_point_dialog.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\control_slave_ui.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\crossfade_edit.h"
                                >
@@ -1653,10 +1689,6 @@
                                RelativePath="..\gtk2_ardour\hit.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\gtk2_ardour\i18n.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\insert_remove_time_dialog.h"
                                >
@@ -1825,10 +1857,6 @@
                                RelativePath="..\gtk2_ardour\missing_plugin_dialog.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\gtk2_ardour\mixer_actor.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\mixer_group_tabs.h"
                                >
@@ -2313,6 +2341,14 @@
                                RelativePath="..\gtk2_ardour\utils_videotl.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\vca_master_strip.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\gtk2_ardour\vca_time_axis.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\gtk2_ardour\verbose_cursor.h"
                                >
@@ -2364,15 +2400,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
                        <File
-                               RelativePath="..\gtk2_ardour\win32\res\mixbus_icon_32px.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\gtk2_ardour\win32\res\mixbus_icon_48px.ico"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\gtk2_ardour\win32\res\mixbus_icon_64px.ico"
+                               RelativePath="..\gtk2_ardour\icons\ardour.ico"
                                >
                        </File>
                        <File