Fixes 280231. WinCE build changes; r=benjamin
git-svn-id: svn://10.0.0.236/trunk@168519 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
94c4ab0b40
commit
b3bd9bc3e0
@ -76,7 +76,7 @@ CPPSRCS = \
|
||||
nsEmbedAPI.cpp \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
CPPSRCS += nsEmbedWin32.cpp
|
||||
endif
|
||||
|
||||
|
||||
@ -108,9 +108,8 @@ extern "C" nsresult NS_TermEmbedding();
|
||||
#undef MOZ_SUPPORTS_EMBEDDING_EVENT_PROCESSING
|
||||
|
||||
/* Win32 specific stuff */
|
||||
#ifdef WIN32
|
||||
#if defined (WIN32) || defined (WINCE)
|
||||
#include "windows.h"
|
||||
|
||||
/**
|
||||
* @var typedef MSG nsEmbedNativeEvent
|
||||
*
|
||||
|
||||
@ -68,7 +68,7 @@ REQUIRES = xpcom \
|
||||
webbrowserpersist \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
endif
|
||||
|
||||
|
||||
@ -126,8 +126,10 @@ endif
|
||||
|
||||
ifeq ($(MOZ_GFX_TOOLKIT),windows)
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win
|
||||
ifneq ($(OS_ARCH), WINCE)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,winspool comdlg32)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user