Make sure that the preprocessor directive in 'winmain.cc' matches the one in 'main.cc'

(also, some minor housekeeping)

diff --git a/MSVCardour3/Ardour3.vcproj b/MSVCardour3/Ardour3.vcproj
index 9fa8e25a2a3712387330daf6315d9fbddeb8d478..96963a21169dc3d14fdb250723ac8ee7e2fd1af2 100644 (file)
--- a/MSVCardour3/Ardour3.vcproj
+++ b/MSVCardour3/Ardour3.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="Ardour3"
+       Name="Mixbus3"
        ProjectGUID="{94B9EA5B-1D83-4573-9F02-29A2E33E6D1F}"
        RootNamespace="Ardour3"
        >
@@ -1238,10 +1238,14 @@
                                RelativePath="..\gtk2_ardour\windows_vst_plugin_ui.cc"
                                >
                        </File>
-                       <File
-                               RelativePath="..\gtk2_ardour\msvc\winmain.cc"
+                       <Filter
+                               Name="msvc"
                                >
-                       </File>
+                               <File
+                                       RelativePath="..\gtk2_ardour\msvc\winmain.cc"
+                                       >
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"

diff --git a/gtk2_ardour/msvc/winmain.cc b/gtk2_ardour/msvc/winmain.cc
index 2e66ee86eef502ea144f8683c0510fd00aff4b1e..a9fe3d42245ad7e867073fe7c2fc540ffd38168d 100644 (file)
--- a/gtk2_ardour/msvc/winmain.cc
+++ b/gtk2_ardour/msvc/winmain.cc
@@ -19,7 +19,7 @@
 
 int ardour_main (int argc, char *argv[]);
 
-#if (defined(LXVST_SUPPORT) || (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD)))
+#if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
 
 #include <fcntl.h>
 #include <shellapi.h>