supporting alignment in single line controls, see #14452

[wxWidgets.git] / build / msw / wx_vc7_gl.vcproj

diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj
index 5045a6b5efa6d08c8407f1a7d88e0758643a035c..cb1f0da55e09508bd502a37b78dbe785a258ad7c 100644 (file)
--- a/build/msw/wx_vc7_gl.vcproj
+++ b/build/msw/wx_vc7_gl.vcproj
@@ -273,7 +273,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswuddll\gl\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswuddll\gl\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -284,13 +284,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -304,7 +304,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r


@@ -338,7 +338,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswudll\gl\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswudll\gl\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -349,13 +349,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r


@@ -371,7 +371,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r


@@ -408,7 +408,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivuddll\gl\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivuddll\gl\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -419,13 +419,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -439,7 +439,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r


@@ -473,7 +473,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivudll\gl\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivudll\gl\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -484,13 +484,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r


@@ -506,7 +506,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r