mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 539378 - Remove MOZ_BITS macro from tree. r=ted
This commit is contained in:
parent
4f69473fdb
commit
a0bc68ebf2
@ -561,7 +561,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
|
||||
# XXX - these need to be cleaned up and have real checks added -cls
|
||||
CM_BLDTYPE=dbg
|
||||
AWT_11=1
|
||||
MOZ_BITS=32
|
||||
OS_TARGET=@OS_TARGET@
|
||||
OS_ARCH=@OS_ARCH@
|
||||
OS_RELEASE=@OS_RELEASE@
|
||||
|
@ -2240,7 +2240,7 @@ case "$target" in
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg$(MOZ_BITS)$(VERSION_NUMBER),$(DEPTH)/jpeg)'
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/jpeg)'
|
||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
|
||||
AC_DEFINE(HAVE_SNPRINTF)
|
||||
AC_DEFINE(_WINDOWS)
|
||||
|
@ -41,12 +41,6 @@
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
!if "$(MOZ_BITS)" == "16"
|
||||
!ifndef MOZ_DEBUG
|
||||
OPTIMIZER=-Os -UDEBUG -DNDEBUG
|
||||
!endif
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
|
@ -46,7 +46,7 @@ LIBRARY_NAME = mozdbm_s
|
||||
LIB_IS_C_ONLY = 1
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBRARY_NAME = dbm$(MOZ_BITS)
|
||||
LIBRARY_NAME = dbm32
|
||||
endif
|
||||
|
||||
CSRCS = \
|
||||
|
@ -41,12 +41,6 @@
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
!if "$(MOZ_BITS)" == "16"
|
||||
!ifndef MOZ_DEBUG
|
||||
OPTIMIZER=-Os -UDEBUG -DNDEBUG
|
||||
!endif
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
@ -64,7 +58,7 @@ MAKE_OBJ_TYPE=EXE
|
||||
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
LIBNAME=dbm$(MOZ_BITS)
|
||||
LIBNAME=dbm32
|
||||
PDBFILE=$(LIBNAME).pdb
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
|
@ -51,7 +51,7 @@ PROGRAM = lots$(BIN_SUFFIX)
|
||||
CSRCS = lots.c
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
|
||||
EXTRA_DSO_LIBS = dbm32
|
||||
else
|
||||
EXTRA_DSO_LIBS = mozdbm_s
|
||||
endif
|
||||
|
@ -46,7 +46,7 @@ MODULE = jpeg
|
||||
LIBRARY_NAME = mozjpeg
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBRARY_NAME = jpeg$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
LIBRARY_NAME = jpeg32$(VERSION_NUMBER)
|
||||
# FIXME: bug 413019
|
||||
ifndef GNU_CC
|
||||
OS_COMPILE_CFLAGS += -GL-
|
||||
|
@ -49,7 +49,7 @@ MODULE = jsdebug
|
||||
LIBRARY_NAME = jsd
|
||||
FORCE_SHARED_LIB= 1
|
||||
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
|
||||
LIBRARY_NAME = jsd$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
LIBRARY_NAME = jsd32$(VERSION_NUMBER)
|
||||
endif
|
||||
|
||||
# REQUIRES = java js
|
||||
|
@ -296,7 +296,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
|
||||
# XXX - these need to be cleaned up and have real checks added -cls
|
||||
CM_BLDTYPE=dbg
|
||||
AWT_11=1
|
||||
MOZ_BITS=32
|
||||
OS_TARGET=@OS_TARGET@
|
||||
OS_ARCH=@OS_ARCH@
|
||||
OS_RELEASE=@OS_RELEASE@
|
||||
|
@ -52,8 +52,8 @@ IS_COMPONENT = 1
|
||||
MODULE_NAME = xpconnect
|
||||
GRE_MODULE = 1
|
||||
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
|
||||
LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
LIBRARY_NAME = xpc32$(VERSION_NUMBER)
|
||||
SHORT_LIBNAME = xpc32$(VERSION_NUMBER)
|
||||
endif
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
@ -48,7 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsPrefModule
|
||||
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
|
||||
LIBRARY_NAME = xppref$(MOZ_BITS)
|
||||
LIBRARY_NAME = xppref32
|
||||
endif
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
Loading…
Reference in New Issue
Block a user