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 486782 - Implement a MOZILLA_FS_LAYOUT makefile variable to distinguish between the bundle layout used by darwin-cocoa and the standard unix-like layout used by darwin-gtk2. Original patch by Jeremy Huddleston, updated and r=bsmedberg

Browse Source
This commit is contained in:
Benjamin Smedberg 2009-04-15 09:08:58 -04:00
parent 5fa5173a94
commit bc5e7e7c68
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -69,6 +69,8 @@ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
MOZ_FS_LAYOUT = @MOZ_FS_LAYOUT@
L10NBASEDIR = @L10NBASEDIR@
LIBXUL_DIST = @LIBXUL_DIST@

9
configure.in
View File

@ -1060,6 +1060,8 @@ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
MOZ_FS_LAYOUT=unix
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
@ -1677,7 +1679,6 @@ case "$host" in
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
;;
*-linux*|*-kfreebsd*-gnu)
@ -1827,7 +1828,6 @@ case "$target" in
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
MOZ_ENABLE_POSTSCRIPT=
TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
LDFLAGS="$LDFLAGS -framework Cocoa"
# The ExceptionHandling framework is needed for Objective-C exception
# logging code in nsObjCExceptions.h. Currently we only use that in debug
# builds.
@ -4872,8 +4872,12 @@ cairo-cocoa)
AC_DEFINE(TARGET_CARBON)
AC_DEFINE(TARGET_API_MAC_CARBON)
TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
TK_CFLAGS="-DNO_X11"
LDFLAGS="$LDFLAGS -framework Cocoa"
CFLAGS="$CFLAGS $TK_CFLAGS"
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
MOZ_FS_LAYOUT=bundle
;;
esac
@ -4896,6 +4900,7 @@ if test "$COMPILE_ENVIRONMENT"; then
fi # COMPILE_ENVIRONMENT
AC_SUBST(MOZ_DEFAULT_TOOLKIT)
AC_SUBST(MOZ_FS_LAYOUT)
dnl ========================================================
dnl = startup-notification support module