Skip to content

Commit

Permalink
去掉glog.lib依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
Techince committed Nov 16, 2023
1 parent 814c089 commit 66d83ea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions WeaselTSF/WeaselTSF.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ModuleDefinitionFile>WeaselTSF.def</ModuleDefinitionFile>
<AdditionalDependencies>Usp10.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glog.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Usp10.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\include</AdditionalIncludeDirectories>
Expand Down Expand Up @@ -323,7 +323,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
<ModuleDefinitionFile>WeaselTSF.def</ModuleDefinitionFile>
<AdditionalDependencies>Usp10.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glog.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Usp10.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\include</AdditionalIncludeDirectories>
Expand Down
2 changes: 1 addition & 1 deletion WeaselUI/WeaselPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ void WeaselPanel::_RepositionWindow(bool adj)
}

#ifdef TEST
LOG(INFO) << std::format("From WeaselPanel::_RepositionWindow. Second: x = {}, y = {}, adj = {}, hwnd = 0x{:X}, hwndParent = 0x{:X}, reverse = {:s}", x, y, adj, (size_t)m_hWnd, (size_t)parentWindow.m_hWnd, (bool)m_style.vertical_auto_reverse);
LOG(INFO) << std::format("From WeaselPanel::_RepositionWindow. Second: x = {}, y = {}, adj = {}, hwnd = 0x{:X}, reverse = {:s}", x, y, adj, (size_t)m_hWnd, (bool)m_style.vertical_auto_reverse);
#endif // TEST
if (y < rcWorkArea.top) y = rcWorkArea.top; // over workarea top
// memorize adjusted position (to avoid window bouncing on height change)
Expand Down

0 comments on commit 66d83ea

Please sign in to comment.