supporting alignment in single line controls, see #14452
[wxWidgets.git] / build / msw / wx_vc7_wxregex.vcproj
index 294e33e86c78b12214a56abd6b2b6b479668f656..ce65c0b26e5edeaab1352e49d922aa22750418c3 100644 (file)
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.8 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -28,7 +28,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -49,7 +49,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -59,7 +59,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
@@ -85,7 +85,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\univ\setup.h">\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"/>\r
+                               RelativePath="..\..\include\wx\msw\setup.h">\r
                                <FileConfiguration\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"/>\r
+                                       Name="Universal Debug|Win32"/>\r
                                <FileConfiguration\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"/>\r
+                                       Name="Universal Release|Win32"/>\r
                                <FileConfiguration\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"/>\r
                        </File>\r
                        <File\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\setup.h">\r
+                               RelativePath="..\..\include\wx\univ\setup.h">\r
                                <FileConfiguration\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"/>\r
+                                       Name="DLL Debug|Win32"/>\r
                                <FileConfiguration\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"/>\r
+                                       Name="DLL Release|Win32"/>\r
                                <FileConfiguration\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"/>\r
                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r