Bug 655473 - Remove WinCE code from IPC; r=cjones
authorEd Morley <bmo@edmorley.co.uk>
Tue, 10 May 2011 20:24:49 +0200
changeset 69264 205cf95cbd62e574b7e3ba39e84802aa4869875d
parent 69263 6f092fa95ba15012578557624f413e5b2e933add
child 69265 c6bea9fce84ec41a77747b578a7144ae0220729c
push id19901
push userMs2ger@gmail.com
push dateTue, 10 May 2011 18:34:22 +0000
treeherdermozilla-central@c6bea9fce84e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs655473
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 655473 - Remove WinCE code from IPC; r=cjones
ipc/app/Makefile.in
ipc/ipdl/test/cxx/app/Makefile.in
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -78,26 +78,18 @@ endif
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
-
-ifdef WINCE
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,corelibc)
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 endif
 
 ifneq (Android,$(OS_TARGET))
 LIBS += $(JEMALLOC_LIBS)
--- a/ipc/ipdl/test/cxx/app/Makefile.in
+++ b/ipc/ipdl/test/cxx/app/Makefile.in
@@ -58,17 +58,13 @@ LIBS = \
   $(LIBXUL_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NSPR_LIBS) \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk