Fixes 280231. WinCE build changes; r=benjamin
This commit is contained in:
Родитель
f92625742e
Коммит
e5dae86af3
|
@ -76,7 +76,7 @@ CPPSRCS = \
|
||||||
nsEmbedAPI.cpp \
|
nsEmbedAPI.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||||
CPPSRCS += nsEmbedWin32.cpp
|
CPPSRCS += nsEmbedWin32.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -108,9 +108,8 @@ extern "C" nsresult NS_TermEmbedding();
|
||||||
#undef MOZ_SUPPORTS_EMBEDDING_EVENT_PROCESSING
|
#undef MOZ_SUPPORTS_EMBEDDING_EVENT_PROCESSING
|
||||||
|
|
||||||
/* Win32 specific stuff */
|
/* Win32 specific stuff */
|
||||||
#ifdef WIN32
|
#if defined (WIN32) || defined (WINCE)
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var typedef MSG nsEmbedNativeEvent
|
* @var typedef MSG nsEmbedNativeEvent
|
||||||
*
|
*
|
||||||
|
|
|
@ -68,7 +68,7 @@ REQUIRES = xpcom \
|
||||||
webbrowserpersist \
|
webbrowserpersist \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
|
||||||
EXTRA_DSO_LIBS = gkgfx
|
EXTRA_DSO_LIBS = gkgfx
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -126,8 +126,10 @@ endif
|
||||||
|
|
||||||
ifeq ($(MOZ_GFX_TOOLKIT),windows)
|
ifeq ($(MOZ_GFX_TOOLKIT),windows)
|
||||||
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win
|
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win
|
||||||
|
ifneq ($(OS_ARCH), WINCE)
|
||||||
OS_LIBS += $(call EXPAND_LIBNAME,winspool comdlg32)
|
OS_LIBS += $(call EXPAND_LIBNAME,winspool comdlg32)
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
|
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
|
||||||
|
|
Загрузка…
Ссылка в новой задаче