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 563462 - Remove Photon bits from the build-system. r=ted,vlad,jwalden

Browse Source
This commit is contained in:
Rob Arnold 2011-06-24 16:49:00 -04:00
parent 733aefd7d5
commit 25cbe701b4
7 changed files with 1 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/app/Makefile.in
View File

@ -156,10 +156,6 @@ endif
include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
LIBS += -lphexlib
endif
ifeq ($(OS_ARCH),WINNT)
#
# Control the default heap size.

1
config/autoconf.mk.in
View File

@ -531,7 +531,6 @@ MOZ_TREE_FREETYPE = @MOZ_TREE_FREETYPE@
MOZ_ENABLE_CAIRO_FT = @MOZ_ENABLE_CAIRO_FT@
MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@
MOZ_ENABLE_QT = @MOZ_ENABLE_QT@
MOZ_ENABLE_PHOTON = @MOZ_ENABLE_PHOTON@
MOZ_ENABLE_XREMOTE = @MOZ_ENABLE_XREMOTE@
MOZ_ENABLE_DWRITE_FONT = @MOZ_ENABLE_DWRITE_FONT@
MOZ_ENABLE_D2D_SURFACE = @MOZ_ENABLE_D2D_SURFACE@

8
config/system-headers
View File

@ -565,14 +565,6 @@ pcfs/pc_dir.h
Pgenerr.h
PGenErr.h
Ph.h
photon/Pg.h
photon/PhProto.h
photon/PhRender.h
photon/PpProto.h
photon/PtProgress.h
photon/PtServer.h
photon/PtWebClient.h
photon/PxImage.h
pk11func.h
pk11pub.h
pkcs11t.h

64
configure.in
View File

@ -1360,8 +1360,6 @@ OSF1)
OS_2)
HOST_OS_ARCH=OS2
;;
QNX)
;;
SCO_SV)
HOST_OS_ARCH=SCOOS
;;
@ -1450,14 +1448,6 @@ OS_2)
OS_TARGET=OS2
OS_RELEASE=`uname -v`
;;
QNX)
if test "$OS_TARGET" != "NTO"; then
changequote(,)
OS_RELEASE=`uname -v | sed 's/^\([0-9]\)\([0-9]*\)$/\1.\2/'`
changequote([,])
fi
OS_TEST=x86
;;
SCO_SV)
OS_ARCH=SCOOS
OS_RELEASE=5.0
@ -2499,37 +2489,6 @@ ia64*-hpux*)
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
;;
*-nto*)
AC_DEFINE(NTO)
AC_DEFINE(_QNX_SOURCE)
AC_DEFINE(_i386)
OS_TARGET=NTO
WARNINGS_AS_ERRORS=''
MOZ_OPTIMIZE_FLAGS="-O"
MOZ_DEBUG_FLAGS="-gstabs"
USE_PTHREADS=1
_PEDANTIC=
LIBS="$LIBS -lsocket -lstdc++"
_DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h -D_POSIX_C_SOURCE=199506'
if test "$with_x" != "yes"
then
_PLATFORM_DEFAULT_TOOLKIT="photon"
TK_CFLAGS='-I/usr/include/photon'
TK_LIBS='-lph'
fi
case "${target_cpu}" in
ppc*)
AC_DEFINE(HAVE_VA_LIST_AS_ARRAY)
;;
esac
case "${host_cpu}" in
i*86)
USE_ELF_DYNSTR_GC=1
;;
esac
;;
*-openbsd*)
if test "$SO_VERSION"; then
DLL_SUFFIX=".so.$SO_VERSION"
@ -2636,20 +2595,6 @@ alpha*-*-osf*)
AC_DEFINE(NEED_USLEEP_PROTOTYPE)
;;
*-qnx*)
DIRENT_INO=d_stat.st_ino
dnl Solves the problems the QNX compiler has with nsCOMPtr.h.
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
dnl Explicit set STDC_HEADERS to workaround QNX 6.0's failing of std test
AC_DEFINE(STDC_HEADERS)
if test "$no_x" = "yes"; then
_PLATFORM_DEFAULT_TOOLKIT='photon'
TK_CFLAGS='-I/usr/nto/include/photon'
TK_LIBS='-lphoton -lphrender'
fi
;;
*-sco*)
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
@ -4963,7 +4908,6 @@ MOZ_ARG_HEADER(Toolkit Options)
Select default toolkit
Platform specific defaults:
Mac OS X - cairo-cocoa
Neutrino/QNX - photon
OS/2 - cairo-os2
Win32 - cairo-windows
Gtk2 with DirectFB - cairo-gtk2-dfb
@ -4972,8 +4916,7 @@ MOZ_ARG_HEADER(Toolkit Options)
[ _DEFAULT_TOOLKIT=$enableval ],
[ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT])
if test "$_DEFAULT_TOOLKIT" = "photon" \
-o "$_DEFAULT_TOOLKIT" = "cairo-windows" \
if test "$_DEFAULT_TOOLKIT" = "cairo-windows" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2-dfb" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2-x11" \
@ -4994,10 +4937,6 @@ dnl = Enable the toolkit as needed =
dnl ========================================================
case "$MOZ_WIDGET_TOOLKIT" in
photon)
MOZ_ENABLE_PHOTON=1
AC_DEFINE(MOZ_WIDGET_PHOTON)
;;
cairo-windows)
MOZ_WIDGET_TOOLKIT=windows
@ -5252,7 +5191,6 @@ AC_SUBST(TK_CFLAGS)
AC_SUBST(TK_LIBS)
AC_SUBST(MOZ_ENABLE_GTK2)
AC_SUBST(MOZ_ENABLE_PHOTON)
AC_SUBST(MOZ_ENABLE_QT)
AC_SUBST(MOZ_ENABLE_QTNETWORK)
AC_SUBST(MOZ_ENABLE_QMSYSTEM2)

8
js/src/config/system-headers
View File

@ -565,14 +565,6 @@ pcfs/pc_dir.h
Pgenerr.h
PGenErr.h
Ph.h
photon/Pg.h
photon/PhProto.h
photon/PhRender.h
photon/PpProto.h
photon/PtProgress.h
photon/PtServer.h
photon/PtWebClient.h
photon/PxImage.h
pk11func.h
pk11pub.h
pkcs11t.h

50
js/src/configure.in
View File

@ -1339,8 +1339,6 @@ OSF1)
OS_2)
HOST_OS_ARCH=OS2
;;
QNX)
;;
SCO_SV)
HOST_OS_ARCH=SCOOS
;;
@ -1434,14 +1432,6 @@ OS_2)
OS_TARGET=OS2
OS_RELEASE=`uname -v`
;;
QNX)
if test "$OS_TARGET" != "NTO"; then
changequote(,)
OS_RELEASE=`uname -v | sed 's/^\([0-9]\)\([0-9]*\)$/\1.\2/'`
changequote([,])
fi
OS_TEST=x86
;;
SCO_SV)
OS_ARCH=SCOOS
OS_RELEASE=5.0
@ -2421,32 +2411,6 @@ ia64*-hpux*)
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
;;
*-nto*)
AC_DEFINE(NTO)
AC_DEFINE(_QNX_SOURCE)
AC_DEFINE(_i386)
OS_TARGET=NTO
WARNINGS_AS_ERRORS=''
MOZ_OPTIMIZE_FLAGS="-O"
MOZ_DEBUG_FLAGS="-gstabs"
USE_PTHREADS=1
_PEDANTIC=
LIBS="$LIBS -lsocket -lstdc++"
_DEFINES_CFLAGS='-include $(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/js-confdefs.h -D_POSIX_C_SOURCE=199506'
if test "$with_x" != "yes"
then
_PLATFORM_DEFAULT_TOOLKIT="photon"
TK_CFLAGS='-I/usr/include/photon'
TK_LIBS='-lph'
fi
case "${target_cpu}" in
ppc*)
AC_DEFINE(HAVE_VA_LIST_AS_ARRAY)
;;
esac
;;
*-openbsd*)
DLL_SUFFIX=".so.1.0"
DSO_CFLAGS=''
@ -2547,20 +2511,6 @@ alpha*-*-osf*)
AC_DEFINE(NEED_USLEEP_PROTOTYPE)
;;
*-qnx*)
DIRENT_INO=d_stat.st_ino
dnl Solves the problems the QNX compiler has with nsCOMPtr.h.
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
dnl Explicit set STDC_HEADERS to workaround QNX 6.0's failing of std test
AC_DEFINE(STDC_HEADERS)
if test "$no_x" = "yes"; then
_PLATFORM_DEFAULT_TOOLKIT='photon'
TK_CFLAGS='-I/usr/nto/include/photon'
TK_LIBS='-lphoton -lphrender'
fi
;;
*-sco*)
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)

4
xulrunner/app/Makefile.in
View File

@ -136,10 +136,6 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
LIBS += -lphexlib
endif
ifeq ($(OS_ARCH),WINNT)
#
# Control the default heap size.