wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 539378 - Remove MOZ_BITS macro from tree. r=ted

Browse Source
This commit is contained in:
Makoto Kato 2010-01-19 14:12:09 +09:00
parent 4f69473fdb
commit a0bc68ebf2
11 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -561,7 +561,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
# XXX - these need to be cleaned up and have real checks added -cls # XXX - these need to be cleaned up and have real checks added -cls
CM_BLDTYPE=dbg CM_BLDTYPE=dbg
AWT_11=1 AWT_11=1
MOZ_BITS=32
OS_TARGET=@OS_TARGET@ OS_TARGET=@OS_TARGET@
OS_ARCH=@OS_ARCH@ OS_ARCH=@OS_ARCH@
OS_RELEASE=@OS_RELEASE@ OS_RELEASE=@OS_RELEASE@

2
configure.in
View File

@ -2240,7 +2240,7 @@ case "$target" in
fi fi
fi 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)' MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
AC_DEFINE(HAVE_SNPRINTF) AC_DEFINE(HAVE_SNPRINTF)
AC_DEFINE(_WINDOWS) AC_DEFINE(_WINDOWS)

6
dbm/include/Makefile.win
View File

@ -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 #// Specify the depth of the current directory relative to the

2
dbm/src/Makefile.in
View File

@ -46,7 +46,7 @@ LIBRARY_NAME = mozdbm_s
LIB_IS_C_ONLY = 1 LIB_IS_C_ONLY = 1
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = dbm$(MOZ_BITS) LIBRARY_NAME = dbm32
endif endif
CSRCS = \ CSRCS = \

8
dbm/src/Makefile.win
View File

@ -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 #// 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, ...) #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
#// #//
#//------------------------------------------------------------------------ #//------------------------------------------------------------------------
LIBNAME=dbm$(MOZ_BITS) LIBNAME=dbm32
PDBFILE=$(LIBNAME).pdb PDBFILE=$(LIBNAME).pdb
#//------------------------------------------------------------------------ #//------------------------------------------------------------------------

2
dbm/tests/Makefile.in
View File

@ -51,7 +51,7 @@ PROGRAM = lots$(BIN_SUFFIX)
CSRCS = lots.c CSRCS = lots.c
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LIBS = dbm$(MOZ_BITS) EXTRA_DSO_LIBS = dbm32
else else
EXTRA_DSO_LIBS = mozdbm_s EXTRA_DSO_LIBS = mozdbm_s
endif endif

2
jpeg/Makefile.in
View File

@ -46,7 +46,7 @@ MODULE = jpeg
LIBRARY_NAME = mozjpeg LIBRARY_NAME = mozjpeg
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = jpeg$(MOZ_BITS)$(VERSION_NUMBER) LIBRARY_NAME = jpeg32$(VERSION_NUMBER)
# FIXME: bug 413019 # FIXME: bug 413019
ifndef GNU_CC ifndef GNU_CC
OS_COMPILE_CFLAGS += -GL- OS_COMPILE_CFLAGS += -GL-

2
js/jsd/Makefile.in
View File

@ -49,7 +49,7 @@ MODULE = jsdebug
LIBRARY_NAME = jsd LIBRARY_NAME = jsd
FORCE_SHARED_LIB= 1 FORCE_SHARED_LIB= 1
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = jsd$(MOZ_BITS)$(VERSION_NUMBER) LIBRARY_NAME = jsd32$(VERSION_NUMBER)
endif endif
# REQUIRES = java js # REQUIRES = java js

1
js/src/config/autoconf.mk.in
View File

@ -296,7 +296,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
# XXX - these need to be cleaned up and have real checks added -cls # XXX - these need to be cleaned up and have real checks added -cls
CM_BLDTYPE=dbg CM_BLDTYPE=dbg
AWT_11=1 AWT_11=1
MOZ_BITS=32
OS_TARGET=@OS_TARGET@ OS_TARGET=@OS_TARGET@
OS_ARCH=@OS_ARCH@ OS_ARCH=@OS_ARCH@
OS_RELEASE=@OS_RELEASE@ OS_RELEASE=@OS_RELEASE@

4
js/src/xpconnect/src/Makefile.in
View File

@ -52,8 +52,8 @@ IS_COMPONENT = 1
MODULE_NAME = xpconnect MODULE_NAME = xpconnect
GRE_MODULE = 1 GRE_MODULE = 1
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER) LIBRARY_NAME = xpc32$(VERSION_NUMBER)
SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER) SHORT_LIBNAME = xpc32$(VERSION_NUMBER)
endif endif
LIBXUL_LIBRARY = 1 LIBXUL_LIBRARY = 1

2
modules/libpref/src/Makefile.in
View File

@ -48,7 +48,7 @@ EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsPrefModule MODULE_NAME = nsPrefModule
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT) ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = xppref$(MOZ_BITS) LIBRARY_NAME = xppref32
endif endif
GRE_MODULE = 1 GRE_MODULE = 1
LIBXUL_LIBRARY = 1 LIBXUL_LIBRARY = 1