From fcc3bdb8284a0607ae66894027aad31b8c144cfc Mon Sep 17 00:00:00 2001 From: Troy Date: Thu, 11 Jun 2015 16:26:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E5=AD=97=E8=8A=82?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=80=89=E9=A1=B9=EF=BC=88A=E7=89=88?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 应邀增加A版 --- Demos/bdwallpaper/BDWallPaper.vcxproj | 133 ++++++++++++++++++++++++++ Demos/bdwallpaper/StdAfx.h | 4 +- Demos/duidemo/StdAfx.h | 4 +- Demos/duidemo/duidemo.vcxproj | 119 +++++++++++++++++++++++ Demos/gamebox/GameBox.vcxproj | 124 ++++++++++++++++++++++++ Demos/gamebox/StdAfx.h | 4 +- Demos/qqsetup/StdAfx.h | 4 +- Demos/qqsetup/qqsetup.vcxproj | 118 +++++++++++++++++++++++ DuiLib.sln | 22 +++++ DuiLib.suo | Bin 0 -> 23040 bytes DuiLib/Core/UIRender.cpp | 25 ++++- DuiLib/DuiLib.vcxproj | 125 ++++++++++++++++++++++++ 12 files changed, 672 insertions(+), 10 deletions(-) create mode 100644 DuiLib.suo diff --git a/Demos/bdwallpaper/BDWallPaper.vcxproj b/Demos/bdwallpaper/BDWallPaper.vcxproj index a98bfd1e..05b264ab 100644 --- a/Demos/bdwallpaper/BDWallPaper.vcxproj +++ b/Demos/bdwallpaper/BDWallPaper.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\BDWallPaper\$(Configuration)\ + $(SolutionDir)temp\BDWallPaper\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\BDWallPaper\$(Configuration)\ + $(SolutionDir)temp\BDWallPaper\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -103,6 +143,46 @@ .\Debug/BDWallPaper.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/BDWallPaper.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + helper;controlex;helper\jsoncpp; + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + .\Debug/BDWallPaper.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -142,35 +222,88 @@ .\Release/BDWallPaper.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/BDWallPaper.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + Level3 + true + helper;controlex;helper\jsoncpp; + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + + + + + true + .\Release/BDWallPaper.bsc + + NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create diff --git a/Demos/bdwallpaper/StdAfx.h b/Demos/bdwallpaper/StdAfx.h index 6191eb85..3051d1ae 100644 --- a/Demos/bdwallpaper/StdAfx.h +++ b/Demos/bdwallpaper/StdAfx.h @@ -20,13 +20,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/duidemo/StdAfx.h b/Demos/duidemo/StdAfx.h index 99dd11e6..ec66e8e7 100644 --- a/Demos/duidemo/StdAfx.h +++ b/Demos/duidemo/StdAfx.h @@ -19,13 +19,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/duidemo/duidemo.vcxproj b/Demos/duidemo/duidemo.vcxproj index 053c1f85..3213b3b2 100644 --- a/Demos/duidemo/duidemo.vcxproj +++ b/Demos/duidemo/duidemo.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\duidemo\$(Configuration)\ + $(SolutionDir)temp\duidemo\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\duidemo\$(Configuration)\ + $(SolutionDir)temp\duidemo\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -101,6 +141,44 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/duidemo.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -138,13 +216,54 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/duidemo.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + + + + + true + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create diff --git a/Demos/gamebox/GameBox.vcxproj b/Demos/gamebox/GameBox.vcxproj index deddddba..73907763 100644 --- a/Demos/gamebox/GameBox.vcxproj +++ b/Demos/gamebox/GameBox.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\gamebox\$(Configuration)\ + $(SolutionDir)temp\gamebox\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\gamebox\$(Configuration)\ + $(SolutionDir)temp\gamebox\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -102,6 +142,45 @@ .\Debug/GameBox.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/GameBox.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + .\Debug/GameBox.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -139,6 +218,43 @@ .\Release/GameBox.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/GameBox.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + stdafx.h + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + libcmt.lib + + + true + .\Release/GameBox.bsc + + @@ -146,17 +262,25 @@ NotUsing + NotUsing NotUsing + NotUsing %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create NotUsing + NotUsing NotUsing + NotUsing diff --git a/Demos/gamebox/StdAfx.h b/Demos/gamebox/StdAfx.h index 99dd11e6..ec66e8e7 100644 --- a/Demos/gamebox/StdAfx.h +++ b/Demos/gamebox/StdAfx.h @@ -19,13 +19,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/qqsetup/StdAfx.h b/Demos/qqsetup/StdAfx.h index 99dd11e6..ec66e8e7 100644 --- a/Demos/qqsetup/StdAfx.h +++ b/Demos/qqsetup/StdAfx.h @@ -19,13 +19,13 @@ using namespace DuiLib; # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib_d.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA_d.lib") # endif #else # ifdef _UNICODE # pragma comment(lib, "..\\..\\lib\\DuiLib.lib") # else -# pragma comment(lib, "..\\..\\lib\\DuiLib.lib") +# pragma comment(lib, "..\\..\\lib\\DuiLibA.lib") # endif #endif diff --git a/Demos/qqsetup/qqsetup.vcxproj b/Demos/qqsetup/qqsetup.vcxproj index 55c9b772..61e797df 100644 --- a/Demos/qqsetup/qqsetup.vcxproj +++ b/Demos/qqsetup/qqsetup.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -29,11 +37,21 @@ false Unicode + + Application + false + MultiByte + Application false Unicode + + Application + false + MultiByte + @@ -41,27 +59,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ + $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ true + true $(SolutionDir)bin\ + $(SolutionDir)bin\ $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ + $(SolutionDir)temp\$(ProjectName)\$(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)_d $(ProjectName) + $(ProjectName) @@ -101,6 +141,44 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/qqsetup.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + true + true + Windows + MachineX86 + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -137,13 +215,53 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/qqsetup.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + NotUsing + stdafx.h + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + Windows + MachineX86 + libcmt.lib + + + true + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create diff --git a/DuiLib.sln b/DuiLib.sln index 84aed6c4..b4b74da5 100644 --- a/DuiLib.sln +++ b/DuiLib.sln @@ -16,29 +16,51 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + DebugA|Win32 = DebugA|Win32 Release|Win32 = Release|Win32 + ReleaseA|Win32 = ReleaseA|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Debug|Win32.ActiveCfg = Debug|Win32 {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Debug|Win32.Build.0 = Debug|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.DebugA|Win32.Build.0 = DebugA|Win32 {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Release|Win32.ActiveCfg = Release|Win32 {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.Release|Win32.Build.0 = Release|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {E106ACD7-4E53-4AEE-942B-D0DD426DB34E}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Debug|Win32.ActiveCfg = Debug|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Debug|Win32.Build.0 = Debug|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.DebugA|Win32.Build.0 = DebugA|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Release|Win32.ActiveCfg = Release|Win32 {565089A1-60C0-4281-99D7-A459E7354EEF}.Release|Win32.Build.0 = Release|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {565089A1-60C0-4281-99D7-A459E7354EEF}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Debug|Win32.ActiveCfg = Debug|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Debug|Win32.Build.0 = Debug|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.DebugA|Win32.Build.0 = DebugA|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Release|Win32.ActiveCfg = Release|Win32 {54019823-E923-44D0-AD60-8EB636D107DC}.Release|Win32.Build.0 = Release|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {54019823-E923-44D0-AD60-8EB636D107DC}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Debug|Win32.ActiveCfg = Debug|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Debug|Win32.Build.0 = Debug|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.DebugA|Win32.Build.0 = DebugA|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Release|Win32.ActiveCfg = Release|Win32 {3EF9795D-3509-4664-8E73-8D315CC0B944}.Release|Win32.Build.0 = Release|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {3EF9795D-3509-4664-8E73-8D315CC0B944}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Debug|Win32.ActiveCfg = Debug|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Debug|Win32.Build.0 = Debug|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.DebugA|Win32.ActiveCfg = DebugA|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.DebugA|Win32.Build.0 = DebugA|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Release|Win32.ActiveCfg = Release|Win32 {797901AA-9447-45C6-AF89-5D5DA54C4159}.Release|Win32.Build.0 = Release|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.ReleaseA|Win32.ActiveCfg = ReleaseA|Win32 + {797901AA-9447-45C6-AF89-5D5DA54C4159}.ReleaseA|Win32.Build.0 = ReleaseA|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DuiLib.suo b/DuiLib.suo new file mode 100644 index 0000000000000000000000000000000000000000..9029441a0f7c7162ae1bc42de9ab3e68fc227ff9 GIT binary patch literal 23040 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 literal 0 HcmV?d00001 diff --git a/DuiLib/Core/UIRender.cpp b/DuiLib/Core/UIRender.cpp index 82a7c2fc..e817ae30 100644 --- a/DuiLib/Core/UIRender.cpp +++ b/DuiLib/Core/UIRender.cpp @@ -1258,10 +1258,11 @@ void CRenderEngine::DrawText(HDC hDC, CPaintManagerUI* pManager, RECT& rc, LPCTS else { stringFormat.SetLineAlignment(Gdiplus::StringAlignmentNear); } - +#ifdef UNICODE if ((uStyle & DT_CALCRECT) != 0) { Gdiplus::RectF bounds; + graphics.MeasureString(pstrText, -1, &font, rectF, &stringFormat, &bounds); // MeasureString´æÔÚ¼ÆËãÎó²î£¬ÕâÀï¼ÓÒ»ÏñËØ @@ -1272,7 +1273,27 @@ void CRenderEngine::DrawText(HDC hDC, CPaintManagerUI* pManager, RECT& rc, LPCTS { graphics.DrawString(pstrText, -1, &font, rectF, &stringFormat, &brush); } - +#else + DWORD dwSize = MultiByteToWideChar(CP_ACP, 0, pstrText, -1, NULL, 0); + WCHAR * pcwszDest = new WCHAR[dwSize + 1]; + memset(pcwszDest, 0, (dwSize + 1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, NULL, pstrText, -1, pcwszDest, dwSize); + if(pcwszDest != NULL) + { + if ((uStyle & DT_CALCRECT) != 0) + { + Gdiplus::RectF bounds; + graphics.MeasureString(pcwszDest, -1, &font, rectF, &stringFormat, &bounds); + rc.bottom = rc.top + (long)(bounds.Height * 1.06); + rc.right = rc.left + (long)(bounds.Width * 1.06); + } + else + { + graphics.DrawString(pcwszDest, -1, &font, rectF, &stringFormat, &brush); + } + delete []pcwszDest; + } +#endif } else { diff --git a/DuiLib/DuiLib.vcxproj b/DuiLib/DuiLib.vcxproj index 5e9899c2..8df8db8c 100644 --- a/DuiLib/DuiLib.vcxproj +++ b/DuiLib/DuiLib.vcxproj @@ -1,10 +1,18 @@  + + DebugA + Win32 + Debug Win32 + + ReleaseA + Win32 + Release Win32 @@ -19,10 +27,18 @@ DynamicLibrary Unicode + + DynamicLibrary + MultiByte + DynamicLibrary Unicode + + DynamicLibrary + MultiByte + @@ -30,30 +46,56 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 false + false false + false false + false false + false false + false false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + $(ProjectName)_d + $(ProjectName)A_d $(SolutionDir)Temp\$(Configuration)\ + $(SolutionDir)Temp\$(Configuration)\ $(SolutionDir)Temp\$(Configuration)\ + $(SolutionDir)Temp\$(Configuration)\ $(SolutionDir)Bin\ + $(SolutionDir)Bin\ $(SolutionDir)Bin\ + $(SolutionDir)Bin\ + $(ProjectName)A @@ -92,6 +134,43 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/DuiLib.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;UILIB_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + $(OutDir)$(TargetName).pdb + 0x11000000 + MachineX86 + $(SolutionDir)Lib\$(ProjectName)A_d.lib + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -128,12 +207,50 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/DuiLib.tlb + + + + + MinSpace + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;UILIB_EXPORTS;%(PreprocessorDefinitions) + true + true + Use + Level3 + true + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0406 + + + true + 0x11000000 + MachineX86 + $(OutDir)$(TargetName).pdb + $(SolutionDir)Lib\$(ProjectName)A.lib + + + true + + Create + Create Create + Create @@ -141,16 +258,24 @@ + + + + + + + +