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

bug 547521 - enable building for windows mobile with --disable-libxul r=ted

Browse Source
This commit is contained in:
Brad Lassey 2010-03-04 13:47:35 -05:00
parent d0e0a35a1a
commit b5f014533e
8 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/src/thebes/Makefile.in
View File

@ -78,8 +78,9 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
CPPSRCS += nsSystemFontsWin.cpp \
$(NULL)
ifndef WINCE
_OS_LIBS = usp10
endif
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
endif

7
gfx/thebes/src/Makefile.in
View File

@ -64,7 +64,10 @@ CPPSRCS += gfxFT2Fonts.cpp \
gfxDDrawSurface.cpp \
gfxFT2FontList.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += ddraw.lib
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
else
ifdef MOZ_ENABLE_DWRITE_FONT
CPPSRCS += gfxDWriteFonts.cpp \
@ -77,11 +80,11 @@ endif
CPPSRCS += gfxWindowsFonts.cpp \
gfxGDIFontList.cpp \
$(NULL)
_OS_LIBS = usp10 msimg32
endif
CPPSRCS += gfxPDFSurface.cpp
_OS_LIBS = usp10 msimg32
ifdef GNU_CXX
_OS_LIBS += uuid
endif

1
modules/freetype2/Makefile.in
View File

@ -47,6 +47,7 @@ LIBRARY_NAME = freetype2
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
DIST_INSTALL = 1
FORCE_STATIC_LIB = 1
VPATH += @srcdir@/src/autofit \
@srcdir@/src/base \

2
modules/libpr0n/decoders/icon/Makefile.in
View File

@ -115,7 +115,7 @@ endif
LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM)
ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,shell32 gdi32 comctl32)
endif

4
netwerk/build/Makefile.in
View File

@ -172,4 +172,8 @@ ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
endif
ifeq ($(OS_ARCH),WINCE)
OS_LIBS += $(call EXPAND_LIBNAME,cellcore ws2)
endif
DEFINES += -DIMPL_NS_NET

9
widget/src/build/Makefile.in
View File

@ -64,10 +64,13 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../windows \
$(NULL)
OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 winspool)
OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32)
ifneq ($(OS_ARCH), WINCE)
OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 imm32 shlwapi)
OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 imm32 shlwapi winspool)
else
OS_LIBS += $(call EXPAND_LIBNAME, aygshell ddraw)
EXTRA_DSO_LDOPTS += $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib
endif
SHARED_LIBRARY_LIBS = \
@ -75,7 +78,7 @@ SHARED_LIBRARY_LIBS = \
../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \

6
widget/src/build/widget.rc
View File

@ -37,7 +37,13 @@
* ***** END LICENSE BLOCK ***** */
#include "resource.h"
#ifdef WINCE
#include "winuser.h"
#include "aygshell.h"
#define DS_CONTEXTHELP 0
#else
#include <winresrc.h>
#endif
#include <dlgs.h>
IDC_GRAB CURSOR DISCARDABLE "res/grab.cur"

10
xpcom/build/Makefile.in
View File

@ -70,12 +70,10 @@ CPPSRCS = \
nsXPCOMStrings.cpp \
$(NULL)
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
CPPSRCS += dlldeps.cpp
ifdef MOZ_ENABLE_LIBXUL
ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
CPPSRCS += dlldeps.cpp
endif
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),OS2)
CPPSRCS += dlldeps.cpp
endif
SHARED_LIBRARY_LIBS = \
@ -190,7 +188,7 @@ endif
endif # WINNT
ifeq ($(OS_ARCH),WINCE)
OS_LIBS += $(call EXPAND_LIBNAME,ole32)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 aygshell)
endif # WINCE
export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS)