summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2014-04-15 10:56:12 +0100
committerJohn Emmas <johne53@tiscali.co.uk>2014-04-15 10:56:12 +0100
commitdcd18d84efb2752be79c1e24b0a0f961dc648871 (patch)
tree313a678751d2681d0c7b8c61898765d45e0c24aa
parent396fae31a9c3f3aa8fe26e287050ec66cad1768a (diff)
Make sure that the preprocessor directive in 'winmain.cc' matches the one in 'main.cc'
(also, some minor housekeeping)
-rw-r--r--MSVCardour3/Ardour3.vcproj12
-rw-r--r--gtk2_ardour/msvc/winmain.cc2
2 files changed, 9 insertions, 5 deletions
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>