зеркало из https://github.com/mozilla/gecko-dev.git
bug 473180. remove TARGET_DEVICE=emulator. It was an old hack to get builds working on wince simulators. no longer needed r=ted+jimb
This commit is contained in:
Родитель
434b9827fa
Коммит
bf850dbb2e
|
@ -563,8 +563,6 @@ 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@
|
||||
|
|
|
@ -8017,7 +8017,6 @@ 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)
|
||||
|
|
|
@ -312,8 +312,6 @@ 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@
|
||||
|
|
|
@ -5032,7 +5032,6 @@ 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)
|
||||
|
|
|
@ -87,12 +87,6 @@ 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
|
||||
|
@ -101,14 +95,6 @@ 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
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче