summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:33:49 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:33:49 +0000
commitb5466b9fe3e49900956823b7fbbe72a3fa80168d (patch)
treea804fffb06dfb1121601c01846a4fffb9959d973 /chrome_frame
parent90f6297322a43f90c0d043cb1f83dda5a3e1c4b0 (diff)
downloadchromium_src-b5466b9fe3e49900956823b7fbbe72a3fa80168d.zip
chromium_src-b5466b9fe3e49900956823b7fbbe72a3fa80168d.tar.gz
chromium_src-b5466b9fe3e49900956823b7fbbe72a3fa80168d.tar.bz2
Fix build of mini_installer with VS2012
BUG=143646 TEST= mini_installer (with branding=chrome) builds Here is the error: t0\src>ninja -C out\Debug mini_installer [1/9] CXX obj\chrome_frame\npchrome_frame.chrome_tab.obj FAILED: ninja -t msvc -r . -o obj\chrome_frame\npchrome_frame.chrome_tab.obj -e environment.x86 -- cl.exe ... .. microsoft visual studio 11.0\vc\atlmfc\include\atlbase.h(2845) : error C2338: 'CAtlDllModuleT<T>' must be used with either _WINDLL or _USRDLL defined ..\microsoft visual studio 11.0\vc\atlmfc\include\atlbase.h(3298) : see reference to class template instantiation 'ATL::CAtlValidateModuleConfiguration<isDllModule,T>' being compiled with [ isDllModule=true, T=`anonymous-namespace'::ChromeTabModule ] t0\src\chrome_frame\chrome_tab.cc(98) : see reference to class template instantiation 'ATL::CAtlDllModuleT<T>' being compiled with [ T=`anonymous-namespace'::ChromeTabModule ] Review URL: https://codereview.chromium.org/11189018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 7526e9a..0d5a7b1 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -862,6 +862,9 @@
'../chrome/chrome.gyp:chrome_version_resources',
'../chrome/chrome.gyp:common',
],
+ 'defines': [
+ '_WINDLL',
+ ],
'sources': [
'chrome_frame_elevation.rgs',
'chrome_frame_reporting.cc',