From: John Emmas <johne53@tiscali.co.uk>
Date: Tue, 15 Apr 2014 09:56:12 +0000 (+0100)
Subject: Make sure that the preprocessor directive in 'winmain.cc' matches the one in 'main.cc'
X-Git-Tag: 4.0-rc1~1601^2~1333
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=dcd18d84efb2752be79c1e24b0a0f961dc648871;p=ardour.git

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 9fa8e25a2a..96963a2116 100644
--- 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 2e66ee86ee..a9fe3d4224 100644
--- 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>