bug 473180. remove TARGET_DEVICE=emulator. It was an old hack to get builds working on wince simulators. no longer needed r=ted+jimb
authorDoug Turner <dougt@meer.net>
Thu, 26 Feb 2009 12:23:25 -0800
changeset 25564 d3bb2720024d7b1660cbf436f47024b2d6b1c1b2
parent 25563 6ac03fc09e48d8317e08721560984b0611afc217
child 25565 8b9317b5ab2e326f4499335d140142e692c43963
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs473180
milestone1.9.2a1pre
bug 473180. remove TARGET_DEVICE=emulator. It was an old hack to get builds working on wince simulators. no longer needed r=ted+jimb
config/autoconf.mk.in
configure.in
js/src/config/autoconf.mk.in
js/src/configure.in
xpcom/reflect/xptcall/src/md/win32/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -558,18 +558,16 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYM
 CM_BLDTYPE=dbg
 AWT_11=1
 MOZ_BITS=32
 OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
 OS_TEST=@OS_TEST@
 
-TARGET_DEVICE = @TARGET_DEVICE@
-
 # For Solaris build
 SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
 SOLARIS_SUNPRO_CXX = @SOLARIS_SUNPRO_CXX@
 
 # For AIX build
 AIX_OBJMODEL = @AIX_OBJMODEL@
 
 # For OS/2 build
--- a/configure.in
+++ b/configure.in
@@ -8012,17 +8012,16 @@ AC_SUBST(MOZ_BUILD_ROOT)
 AC_SUBST(MOZ_OS2_TOOLS)
 AC_SUBST(MOZ_OS2_USE_DECLSPEC)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
 AC_SUBST(WINCE)
 AC_SUBST(WINCE_SDK_DIR)
-AC_SUBST(TARGET_DEVICE)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 AC_SUBST(FIREFOX_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -307,18 +307,16 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYM
 CM_BLDTYPE=dbg
 AWT_11=1
 MOZ_BITS=32
 OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
 OS_TEST=@OS_TEST@
 
-TARGET_DEVICE = @TARGET_DEVICE@
-
 # For Solaris build
 SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
 SOLARIS_SUNPRO_CXX = @SOLARIS_SUNPRO_CXX@
 
 # For AIX build
 AIX_OBJMODEL = @AIX_OBJMODEL@
 
 # For OS/2 build
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -5027,17 +5027,16 @@ AC_SUBST(USE_DEPENDENT_LIBS)
 AC_SUBST(MOZ_BUILD_ROOT)
 AC_SUBST(MOZ_OS2_TOOLS)
 AC_SUBST(MOZ_OS2_USE_DECLSPEC)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
 AC_SUBST(WINCE)
-AC_SUBST(TARGET_DEVICE)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -82,38 +82,24 @@ ASFLAGS		+= /I../../..public
 endif
 
 ifeq ($(TARGET_CPU),x86_64)
 CPPSRCS 	:= xptcinvoke_x86_64.cpp xptcstubs_x86_64.cpp
 ASFILES		:= xptcinvoke_asm_x86_64.asm xptcstubs_asm_x86_64.asm
 endif
 
 ifeq ($(OS_ARCH),WINCE)
-
-ifeq ($(TARGET_DEVICE),)
-TARGET_DEVICE=device
-endif
-
-ifeq ($(TARGET_DEVICE),device)
 ifeq ($(TARGET_CPU),arm)
 CPPSRCS 	= xptcinvokece.cpp xptcstubsce.cpp 
 ASFILES		= xptc_arm_ceppc.asm
 ASFLAGS		+= -I ../../../public
 AS_DASH_C_FLAG = 
 endif
 endif
 
-ifeq ($(TARGET_DEVICE),emulator)
-CPPSRCS 	= xptcinvoke.cpp xptcstubs.cpp 
-ASFILES		= 
-ASFLAGS		+= -I ../../../public
-AS_DASH_C_FLAG	= 
-endif
-endif
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DEXPORT_XPTC_API -D_IMPL_NS_COM
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../..