Commit 290907e4 authored by grt@chromium.org's avatar grt@chromium.org

Use #pragma comment(lib, "userenv.lib") rather than AdditionalDependencies. It's better.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10704135

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145961 0039d316-1c4b-4281-b951-d872f2087c98
parent bfea4f01
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/install_util.h"
#include "policy/policy_constants.h" #include "policy/policy_constants.h"
// userenv.dll is required for GetProfileType().
#pragma comment(lib, "userenv.lib")
namespace breakpad_win { namespace breakpad_win {
std::vector<google_breakpad::CustomInfoEntry>* g_custom_entries = NULL; std::vector<google_breakpad::CustomInfoEntry>* g_custom_entries = NULL;
......
...@@ -464,9 +464,6 @@ ...@@ -464,9 +464,6 @@
], ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalDependencies': [
'userenv.lib',
],
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
'DelayLoadDLLs': [ 'DelayLoadDLLs': [
...@@ -565,9 +562,6 @@ ...@@ -565,9 +562,6 @@
], ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalDependencies': [
'userenv.lib',
],
'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment