Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 736980 - testing/tools/screenshot fails to link on mingw r=khuey

Browse Source
This commit is contained in:
Jacek Caban 2012-03-21 17:25:29 +01:00
parent 3242e91654
commit 4491a6a3a7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/tools/screenshot/Makefile.in
View File

@ -57,9 +57,14 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
PROGRAM = screenshot$(BIN_SUFFIX) PROGRAM = screenshot$(BIN_SUFFIX)
CPPSRCS = win32-screenshot.cpp CPPSRCS = win32-screenshot.cpp
OS_LIBS += $(call EXPAND_LIBNAME,gdiplus)
MOZ_GLUE_PROGRAM_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS =
USE_STATIC_LIBS = 1 USE_STATIC_LIBS = 1
ifdef GNU_CC
WIN32_EXE_LDFLAGS = -municode
endif
endif # windows endif # windows
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

13
testing/tools/screenshot/win32-screenshot.cpp
View File

@ -32,24 +32,16 @@
* If a filename is specified as the first argument on the commandline, * If a filename is specified as the first argument on the commandline,
* then the image will be saved to that filename. Otherwise, the image will * then the image will be saved to that filename. Otherwise, the image will
* be saved as "screenshot.png" in the current working directory. * be saved as "screenshot.png" in the current working directory.
*
* Requires GDI+. All linker dependencies are specified explicitly in this
* file, so you can compile screenshot.exe by simply running:
* cl screenshot.cpp
*/ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <gdiplus.h> #include <gdiplus.h>
#pragma comment(lib, "user32.lib")
#pragma comment(lib, "gdi32.lib")
#pragma comment(lib, "gdiplus.lib")
using namespace Gdiplus; using namespace Gdiplus;
// From http://msdn.microsoft.com/en-us/library/ms533843%28VS.85%29.aspx // From http://msdn.microsoft.com/en-us/library/ms533843%28VS.85%29.aspx
int GetEncoderClsid(const WCHAR* format, CLSID* pClsid) static int GetEncoderClsid(const WCHAR* format, CLSID* pClsid)
{ {
UINT num = 0; // number of image encoders UINT num = 0; // number of image encoders
UINT size = 0; // size of the image encoder array in bytes UINT size = 0; // size of the image encoder array in bytes
@ -80,6 +72,9 @@ int GetEncoderClsid(const WCHAR* format, CLSID* pClsid)
return -1; // Failure return -1; // Failure
} }
#ifdef __MINGW32__
extern "C"
#endif
int wmain(int argc, wchar_t** argv) int wmain(int argc, wchar_t** argv)
{ {
GdiplusStartupInput gdiplusStartupInput; GdiplusStartupInput gdiplusStartupInput;