Update vc10 build file versions to 3.0.0.

author Steve Lamerton <steve.lamerton@gmail.com>

Wed, 18 Sep 2013 15:12:34 +0000 (15:12 +0000)

committer Steve Lamerton <steve.lamerton@gmail.com>

Wed, 18 Sep 2013 15:12:34 +0000 (15:12 +0000)
author Steve Lamerton <steve.lamerton@gmail.com>
Wed, 18 Sep 2013 15:12:34 +0000 (15:12 +0000)
committer Steve Lamerton <steve.lamerton@gmail.com>
Wed, 18 Sep 2013 15:12:34 +0000 (15:12 +0000)
diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj

index 13a860900ad770bbc4761520ec56a2ddcfddf5de..75c4eb3237308612377ec36c50ec112a2de32b4a 100644 (file)
--- a/build/msw/wx_vc10_adv.vcxproj
+++ b/build/msw/wx_vc10_adv.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\adv\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_adv</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_adv</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_adv</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_adv</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_advlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\adv\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_adv.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_adv.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_adv.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_adv.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_advlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\adv\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_adv.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_adv.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_adv.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_adv.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_advdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\adv\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_adv_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_adv_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_adv_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_adv.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_adv_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_adv.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_adv_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_adv_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_advdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\adv\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_adv_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_adv_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_adv_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_adv.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_adv_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_adv.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_adv_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_adv_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj

index 709f60a69afe33f3ae64cfa50166568d180e0c9b..6fc31f7ce27995b3b9f571abbf78f3c07e4ba3fa 100644 (file)
--- a/build/msw/wx_vc10_aui.vcxproj
+++ b/build/msw/wx_vc10_aui.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\aui\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_aui</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_aui</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_aui</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_aui</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_auilib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\aui\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_aui.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_aui.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_aui.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_aui.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_auilib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\aui\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_aui.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_aui.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_aui.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_aui.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_auidll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\aui\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_aui_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_aui_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_aui_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_aui.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_aui_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_aui.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_aui_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_aui_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_auidll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\aui\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_aui_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_aui_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_aui_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_aui.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_aui_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_aui.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_aui_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_aui_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj

index 30480f4fe9e67e6a52decc001474465889fcfecf..0f402f52264cb9e473e7aed764912f0fb118c87f 100644 (file)
--- a/build/msw/wx_vc10_base.vcxproj
+++ b/build/msw/wx_vc10_base.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\base\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase29ud</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wx$(ProjectName)295ud_vc_custom</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase29u</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wx$(ProjectName)295u_vc_custom</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase30ud</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wx$(ProjectName)30ud_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase30u</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wx$(ProjectName)30u_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_baselib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\base\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase29ud.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxbase29ud.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30ud.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\base\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase29u.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxbase29u.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30u.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\base\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase295ud_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
        <AdditionalDependencies>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;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295ud_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29ud.lib</ImportLibrary>\r
+      <OutputFile>$(OutDir)wxbase30ud_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30ud.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxbase295ud_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30ud_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\base\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase295u_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
        <AdditionalDependencies>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;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295u_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29u.lib</ImportLibrary>\r
+      <OutputFile>$(OutDir)wxbase30u_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30u.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxbase295u_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30u_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj

index 4cb486a44cee85ebc03f855386b2752e1af460c7..077b5b6fe6bb920c6eb253fdc18da16d66c387e4 100644 (file)
--- a/build/msw/wx_vc10_core.vcxproj
+++ b/build/msw/wx_vc10_core.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_core</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_core</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_core</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_core</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_corelib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\core\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_core.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_core.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_core.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_core.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\core\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_core.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_core.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_core.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_core.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\core\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_core_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_core_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_core_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_core.lib</ImportLibrary>\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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_core_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_core.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_core_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_core_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\core\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_core_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_core_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_core_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_core.lib</ImportLibrary>\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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_core_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_core.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_core_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_core_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -1310,4 +1310,4 @@
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
    <ImportGroup Label="ExtensionTargets">\r
    </ImportGroup>\r
-</Project>
+</Project>\r
diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj

index 67480cabeef64b988fb7c85f90f2d376042ca347..37e4214668ba74185d6ee321c6fa87a026ff099e 100644 (file)
--- a/build/msw/wx_vc10_gl.vcxproj
+++ b/build/msw/wx_vc10_gl.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\gl\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_gl</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_gl</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_gl</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_gl</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_gllib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\gl\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_gl.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_gl.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_gl.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_gl.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_gllib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\gl\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_gl.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_gl.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_gl.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_gl.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_gldll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\gl\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_gl_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_gl_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_gl_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_gl.lib</ImportLibrary>\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;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_gl_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_gl.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_gl_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_gl_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_gldll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\gl\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_gl_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_gl_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_gl_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_gl.lib</ImportLibrary>\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;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_gl_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_gl.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_gl_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_gl_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj

index ff285b9774cc1d6abd916b774b706b3ed7ef9323..17a0ab5158d05c238a129eecae374cf06ef2f475 100644 (file)
--- a/build/msw/wx_vc10_html.vcxproj
+++ b/build/msw/wx_vc10_html.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\html\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_html</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_html</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_html</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_html</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_htmllib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\html\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_html.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_html.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_html.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_html.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_htmllib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\html\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_html.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_html.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_html.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_html.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_htmldll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\html\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_html_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_html_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_html_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_html.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_html_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_html.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_html_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_html_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_htmldll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\html\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_html_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_html_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_html_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_html.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_html_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_html.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_html_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_html_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj

index b0827291dad27a8206c74ca5ebed512239f0c2ae..a90472a8295008690e6fdc9061a4b3461b8e88f3 100644 (file)
--- a/build/msw/wx_vc10_media.vcxproj
+++ b/build/msw/wx_vc10_media.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\media\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_media</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_media</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_media</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_media</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_medialib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\media\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_media.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_media.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_media.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_media.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_medialib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\media\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_media.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_media.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_media.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_media.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_mediadll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\media\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_media_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_media_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_media_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_media.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_media_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_media.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_media_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_media_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_mediadll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\media\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_media_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_media_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_media_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_media.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_media_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_media.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_media_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_media_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj

index be87f401c7cb68ce5ae3f47741ddf346eed09e99..155986596772d253f06a686e537dc679b9bf7918 100644 (file)
--- a/build/msw/wx_vc10_net.vcxproj
+++ b/build/msw/wx_vc10_net.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\net\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase29ud_net</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase29u_net</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxbase295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxbase295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase30ud_net</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase30u_net</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxbase30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxbase30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_netlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\net\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase29ud_net.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_net.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxbase29ud_net.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30ud_net.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_netlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\net\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase29u_net.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_net.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxbase29u_net.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30u_net.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_netdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\net\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase295ud_net_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_net_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
-      <AdditionalDependencies>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;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295ud_net_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29ud_net.lib</ImportLibrary>\r
+      <AdditionalDependencies>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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxbase30ud_net_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30ud_net.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxbase295ud_net_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30ud_net_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_netdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\net\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase295u_net_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_net_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
-      <AdditionalDependencies>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;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295u_net_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29u_net.lib</ImportLibrary>\r
+      <AdditionalDependencies>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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxbase30u_net_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30u_net.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxbase295u_net_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30u_net_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj

index 2d0109182fdb87b084ed82b0d7b4bae500b0d590..fd89101d86c010e750c54e054892faa765a1669e 100644 (file)
--- a/build/msw/wx_vc10_propgrid.vcxproj
+++ b/build/msw/wx_vc10_propgrid.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\propgrid\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_propgrid</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_propgrid</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_propgrid</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_propgrid</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_propgridlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\propgrid\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_propgrid.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_propgrid.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_propgrid.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_propgrid.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_propgridlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\propgrid\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_propgrid.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_propgrid.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_propgrid.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_propgrid.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_propgriddll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\propgrid\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_propgrid_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_propgrid_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_propgrid_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_propgrid.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_propgrid_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_propgrid.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_propgrid_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_propgrid_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_propgriddll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\propgrid\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_propgrid_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_propgrid_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_propgrid_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_propgrid.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_propgrid_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_propgrid.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_propgrid_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_propgrid_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj

index 0adc5965f8c1a383474791ecbb5563e6aa609f4b..13e2fd6178f5212c4d5599619d0eaf5262570dc1 100644 (file)
--- a/build/msw/wx_vc10_qa.vcxproj
+++ b/build/msw/wx_vc10_qa.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\qa\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_qa</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_qa</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_qa</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_qa</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_qalib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\qa\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_qa.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_qa.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_qa.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_qa.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_qalib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\qa\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_qa.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_qa.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_qa.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_qa.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_qadll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\qa\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_qa_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_qa_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;$(OutDir)wxbase29ud_xml.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_qa_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_qa.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_qa_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_qa.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_qa_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_qa_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_qadll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\qa\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_qa_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_qa_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;$(OutDir)wxbase29u_xml.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_qa_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_qa.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_qa_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_qa.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_qa_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_qa_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj

index 97f36ad13b8904247af91b8d7a5095b5c92e48d8..6ebc8825c1f411aaa21de22ad6813c9881bb72e4 100644 (file)
--- a/build/msw/wx_vc10_ribbon.vcxproj
+++ b/build/msw/wx_vc10_ribbon.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\ribbon\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_ribbon</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_ribbon</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_ribbon</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_ribbon</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_ribbonlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\ribbon\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_ribbon.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_ribbon.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_ribbon.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_ribbon.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_ribbonlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\ribbon\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_ribbon.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_ribbon.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_ribbon.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_ribbon.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_ribbondll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\ribbon\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_ribbon_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_ribbon_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_ribbon_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_ribbon.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_ribbon_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_ribbon.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_ribbondll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\ribbon\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_ribbon_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_ribbon_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_ribbon_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_ribbon.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_ribbon_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_ribbon.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_ribbon_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj

index 28d4905b8e20c220a9ac63c6f7dcca3c76194842..00a73de0ac6b719ba13fca34f5385e6c932b7c99 100644 (file)
--- a/build/msw/wx_vc10_richtext.vcxproj
+++ b/build/msw/wx_vc10_richtext.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\richtext\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_richtext</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_richtext</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_richtext</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_richtext</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_richtextlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\richtext\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_richtext.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_richtext.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_richtext.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_richtext.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_richtextlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\richtext\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_richtext.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_richtext.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_richtext.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_richtext.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_richtextdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\richtext\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_richtext_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_richtext_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_html.lib;$(OutDir)wxbase29ud_xml.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_richtext_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_richtext.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_richtext_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_richtext.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_richtext_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_richtext_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_richtextdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\richtext\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_richtext_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_richtext_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_html.lib;$(OutDir)wxbase29u_xml.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_richtext_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_richtext.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_richtext_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_richtext.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_richtext_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_richtext_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj

index 9a36cce803d4cf11c14e9863b8a9556b9ef9fbf4..4888343dd969fe287bff5b18979b676088f3f3fb 100644 (file)
--- a/build/msw/wx_vc10_stc.vcxproj
+++ b/build/msw/wx_vc10_stc.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\stc\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_stc</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_stc</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_stc</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_stc</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_stclib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\stc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_stc.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_stc.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_stc.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_stc.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_stclib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\stc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_stc.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_stc.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_stc.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_stc.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_stcdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\stc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_stc_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_stc_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_stc_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_stc.lib</ImportLibrary>\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;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_stc_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_stc.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_stc_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_stc_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_stcdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\stc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_stc_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_stc_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_stc_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_stc.lib</ImportLibrary>\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;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_stc_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_stc.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_stc_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_stc_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj

index 7f7981158e83e7173efded97d78b2547bd34424d..37bd28da755e3353d69a144b4e3e5f90576b4e69 100644 (file)
--- a/build/msw/wx_vc10_webview.vcxproj
+++ b/build/msw/wx_vc10_webview.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\webview\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_webview</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_webview</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_webview</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_webview</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_webviewlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\webview\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_webview.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_webview.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_webview.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_webview.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_webviewlib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\webview\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_webview.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_webview.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_webview.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_webview.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_webviewdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\webview\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_webview_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_webview_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_webview_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_webview.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_webview_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_webview.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_webview_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_webview_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_webviewdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\webview\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_webview_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_webview_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_webview_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_webview.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_webview_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_webview.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_webview_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_webview_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj

index 645afbd18f16b9c0c657cdb93141095de0a18cbd..ae2af8dab8ac91291261c80f0e42bdc980140ca2 100644 (file)
--- a/build/msw/wx_vc10_xml.vcxproj
+++ b/build/msw/wx_vc10_xml.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\xml\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase29ud_xml</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase29u_xml</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxbase295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxbase295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase30ud_xml</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxbase30u_xml</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxbase30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxbase30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_xmllib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\xml\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase29ud_xml.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_xml.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxbase29ud_xml.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30ud_xml.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_xmllib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\xml\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase29u_xml.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_xml.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxbase29u_xml.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxbase30u_xml.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_xmldll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\xml\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase295ud_xml_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30ud_xml_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
-      <AdditionalDependencies>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;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295ud_xml_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29ud_xml.lib</ImportLibrary>\r
+      <AdditionalDependencies>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;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxbase30ud_xml_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30ud_xml.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxbase295ud_xml_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30ud_xml_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_xmldll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\xml\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxbase295u_xml_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxbase30u_xml_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>\r
-      <AdditionalDependencies>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;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxbase295u_xml_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxbase29u_xml.lib</ImportLibrary>\r
+      <AdditionalDependencies>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;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxbase30u_xml_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxbase30u_xml.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxbase295u_xml_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxbase30u_xml_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj

index 64f6421be266554368b34f0114185ede6d4e9224..6cf6aa8be6cfa192465c7b424aeb915c283667a1 100644 (file)
--- a/build/msw/wx_vc10_xrc.vcxproj
+++ b/build/msw/wx_vc10_xrc.vcxproj
@@ -73,10 +73,10 @@
      <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\xrc\</IntDir>\r
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>\r
      <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29ud_xrc</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw29u_xrc</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw295ud_$(ProjectName)_vc_custom</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw295u_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw30ud_xrc</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wxmsw30u_xrc</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">wxmsw30ud_$(ProjectName)_vc_custom</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">wxmsw30u_$(ProjectName)_vc_custom</TargetName>\r
    </PropertyGroup>\r
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
      <Midl>\r
@@ -97,7 +97,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswud\wxprec_xrclib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswud\xrc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29ud_xrc.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_xrc.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -108,7 +108,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29ud_xrc.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30ud_xrc.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -133,7 +133,7 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswu\wxprec_xrclib.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswu\xrc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw29u_xrc.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_xrc.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -144,7 +144,7 @@
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Lib>\r
-      <OutputFile>$(OutDir)wxmsw29u_xrc.lib</OutputFile>\r
+      <OutputFile>$(OutDir)wxmsw30u_xrc.lib</OutputFile>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
      </Lib>\r
      <Bscmake>\r
@@ -171,25 +171,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_xrcdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswuddll\xrc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295ud_xrc_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30ud_xrc_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29ud_html.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud_xml.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295ud_xrc_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29ud_xrc.lib</ImportLibrary>\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;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30ud_xrc_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30ud_xrc.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295ud_xrc_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30ud_xrc_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
      </Link>\r
      <Bscmake>\r
@@ -214,25 +214,25 @@
        <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_xrcdll.pch</PrecompiledHeaderOutputFile>\r
        <ObjectFileName>vc_mswudll\xrc\</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(OutDir)wxmsw295u_xrc_vc_custom.pdb</ProgramDataBaseFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)wxmsw30u_xrc_vc_custom.pdb</ProgramDataBaseFileName>\r
        <WarningLevel>Level4</WarningLevel>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
      </ClCompile>\r
      <ResourceCompile>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
        <Culture>0x0409</Culture>\r
        <AdditionalIncludeDirectories>$(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
      </ResourceCompile>\r
      <Link>\r
        <AdditionalOptions>%(AdditionalOptions)</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;$(OutDir)wxmsw29u_html.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u_xml.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)wxmsw295u_xrc_vc_custom.dll</OutputFile>\r
-      <ImportLibrary>$(OutDir)wxmsw29u_xrc.lib</ImportLibrary>\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;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)wxmsw30u_xrc_vc_custom.dll</OutputFile>\r
+      <ImportLibrary>$(OutDir)wxmsw30u_xrc.lib</ImportLibrary>\r
        <SuppressStartupBanner>true</SuppressStartupBanner>\r
        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
        <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)wxmsw295u_xrc_vc_custom.pdb</ProgramDatabaseFile>\r
+      <ProgramDatabaseFile>$(OutDir)wxmsw30u_xrc_vc_custom.pdb</ProgramDatabaseFile>\r
        <TargetMachine>MachineX86</TargetMachine>\r
        <OptimizeReferences>true</OptimizeReferences>\r
        <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
author	Steve Lamerton <steve.lamerton@gmail.com>
	Wed, 18 Sep 2013 15:12:34 +0000 (15:12 +0000)
committer	Steve Lamerton <steve.lamerton@gmail.com>
	Wed, 18 Sep 2013 15:12:34 +0000 (15:12 +0000)
build/msw/wx_vc10_adv.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_aui.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_base.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_core.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_gl.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_html.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_media.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_net.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_propgrid.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_qa.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_ribbon.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_richtext.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_stc.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_webview.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_xml.vcxproj		patch \| blob \| blame \| history
build/msw/wx_vc10_xrc.vcxproj		patch \| blob \| blame \| history