Bug 531300 - Link failure in testplugin on mingw, r=roc
authorJacek Caban <jacek@codeweavers.com>
Sun, 13 Dec 2009 09:44:15 -0800
changeset 35677 b3c1f6691f8e5fbd0292f5e4f426e8ac91e666ed
parent 35676 929bce835cdb6f1ebe497d35923dce3a44738f61
child 35678 25e1f548b4ae266bf67396dfb14481675772c93a
push id10673
push userphilringnalda@gmail.com
push dateSun, 13 Dec 2009 17:44:42 +0000
treeherdermozilla-central@b3c1f6691f8e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs531300
milestone1.9.3a1pre
Bug 531300 - Link failure in testplugin on mingw, r=roc
modules/plugin/test/testplugin/Makefile.in
modules/plugin/test/testplugin/nptest_windows.cpp
--- a/modules/plugin/test/testplugin/Makefile.in
+++ b/modules/plugin/test/testplugin/Makefile.in
@@ -72,16 +72,17 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CPPSRCS += nptest_qt.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS  += nptest_windows.cpp
 RCFILE    = nptest.rc
 RESFILE   = nptest.res
 DEFFILE   = $(win_srcdir)/nptest.def
+OS_LIBS  += $(call EXPAND_LIBNAME,msimg32)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)
 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
--- a/modules/plugin/test/testplugin/nptest_windows.cpp
+++ b/modules/plugin/test/testplugin/nptest_windows.cpp
@@ -34,18 +34,16 @@
 
 #include "nptest_platform.h"
 
 #include <windows.h>
 #include <windowsx.h>
 
  using namespace std;
 
-#pragma comment(lib, "msimg32.lib")
-
 void SetSubclass(HWND hWnd, InstanceData* instanceData);
 void ClearSubclass(HWND hWnd);
 LRESULT CALLBACK PluginWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 struct _PlatformData {
   HWND childWindow;
 };