mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Making changes for the Neutrino/Photon platform to switch from Photon 1
to Photon 2 and from cross compiling under QNX to native compiling under Neutrino.
This commit is contained in:
parent
7edec295ef
commit
a858f09231
23
configure.in
23
configure.in
@ -646,13 +646,13 @@ case "$target" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
*-nto*)
|
*-nto*)
|
||||||
CFLAGS="$CFLAGS -DNTO -D__QNXNTO__ -D_QNX_SOURCE -D_POSIX_SOURCE -D__i386__ -D_i386 -DNSCAP_NO_EXPLICIT -DNO_REGEX -DSTRINGS_ALIGNED -D_SEEKPOS_DEFINED_ -I/usr/gcc/lib/gcc-lib/ntox86/2.8.1/include"
|
CFLAGS="$CFLAGS -DNTO -D_QNX_SOURCE -D_POSIX_C_SOURCE=199506 -D_i386"
|
||||||
CXXFLAGS="$CXXFLAGS -DNTO -D__QNXNTO__ -D_QNX_SOURCE -D_POSIX_SOURCE -D__i386__ -D_i386 -DNSCAP_NO_EXPLICIT -DNO_REGEX -DSTRINGS_ALIGNED -D_SEEKPOS_DEFINED_ -I/usr/gcc/lib/gcc-lib/ntox86/2.8.1/include"
|
CXXFLAGS="$CXXFLAGS -DNTO -D_QNX_SOURCE -D_POSIX_C_SOURCE=199506 -D_i386"
|
||||||
_WARNINGS_CFLAGS='-w'
|
_WARNINGS_CFLAGS='-w'
|
||||||
_WARNINGS_CXXFLAGS='-w'
|
_WARNINGS_CXXFLAGS='-w'
|
||||||
OS_TARGET="NTO"
|
OS_TARGET="NTO"
|
||||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
MOZ_OPTIMIZE_FLAGS="-O1"
|
||||||
MOZ_DEBUG_FLAGS="-gdwarf-2"
|
MOZ_DEBUG_FLAGS="-gstabs"
|
||||||
DSO_LDOPTS="-M $DSO_LDOPTS"
|
DSO_LDOPTS="-M $DSO_LDOPTS"
|
||||||
DSO_CFLAGS=''
|
DSO_CFLAGS=''
|
||||||
DSO_PIC_CFLAGS="-shared -Wc,-fPIC -DPIC"
|
DSO_PIC_CFLAGS="-shared -Wc,-fPIC -DPIC"
|
||||||
@ -660,9 +660,9 @@ case "$target" in
|
|||||||
MKCSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS)'
|
MKCSHLIB='qcc -Vgcc_ntox86 $(DSO_LDOPTS)'
|
||||||
AR='qcc -Vgcc_ntox86'
|
AR='qcc -Vgcc_ntox86'
|
||||||
AR_FLAGS='-M -a $@'
|
AR_FLAGS='-M -a $@'
|
||||||
AR_LIST='ar.elf t'
|
AR_LIST='ar t'
|
||||||
AR_EXTRACT='ar.elf x'
|
AR_EXTRACT='ar x'
|
||||||
AR_DELETE='ar.elf d'
|
AR_DELETE='ar d'
|
||||||
_DEFINES_CFLAGS='-Wp,-include,$(DEPTH)/config-defs.h -DMOZILLA_CLIENT'
|
_DEFINES_CFLAGS='-Wp,-include,$(DEPTH)/config-defs.h -DMOZILLA_CLIENT'
|
||||||
_DEFINES_CXXFLAGS='-Wp,-include,$(DEPTH)/config-defs.h -DMOZILLA_CLIENT'
|
_DEFINES_CXXFLAGS='-Wp,-include,$(DEPTH)/config-defs.h -DMOZILLA_CLIENT'
|
||||||
_PREPROCESSOR_PREFIX="-Wp,"
|
_PREPROCESSOR_PREFIX="-Wp,"
|
||||||
@ -670,7 +670,7 @@ case "$target" in
|
|||||||
_LINKER_PREFIX="-Wl,"
|
_LINKER_PREFIX="-Wl,"
|
||||||
USE_PTHREADS=1
|
USE_PTHREADS=1
|
||||||
_PTHREAD_LDFLAGS=""
|
_PTHREAD_LDFLAGS=""
|
||||||
LIBS="$LIBS -lstdc++"
|
LIBS="$LIBS -L/usr/lib -lsocket -lm -lstdc++"
|
||||||
HAVE_DEV_ZERO=1
|
HAVE_DEV_ZERO=1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -887,8 +887,8 @@ fi
|
|||||||
if test "`echo $target_os | egrep "nto"`"; then
|
if test "`echo $target_os | egrep "nto"`"; then
|
||||||
MOZ_WIDGET_TOOLKIT="photon"
|
MOZ_WIDGET_TOOLKIT="photon"
|
||||||
AC_DEFINE(NO_X11)
|
AC_DEFINE(NO_X11)
|
||||||
TK_CFLAGS='-I/usr/nto/include/photon'
|
TK_CFLAGS='-I/usr/include/photon'
|
||||||
TK_LIBS='-lphoton -lphrender'
|
TK_LIBS='-lph -lphrender'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl XXX BROKEN dnl ========================================================
|
dnl XXX BROKEN dnl ========================================================
|
||||||
@ -2445,6 +2445,9 @@ then
|
|||||||
*-linux*)
|
*-linux*)
|
||||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(topsrcdir)/build/unix/gnu-ld-scripts/components-version-script'
|
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(topsrcdir)/build/unix/gnu-ld-scripts/components-version-script'
|
||||||
;;
|
;;
|
||||||
|
*-nto*)
|
||||||
|
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(topsrcdir)/build/unix/gnu-ld-scripts/components-version-script'
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user