From 0f535e7061c116b2be882a5660458a599a7aadfc Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Thu, 25 Oct 2001 08:55:53 +0000 Subject: [PATCH] Land the simple OSX Mach-O build changes. Bug #75653 r=cls --- config/Makefile.in | 4 -- config/config.mk | 5 -- content/xbl/builtin/Makefile.in | 4 ++ widget/src/mac/Makefile.in | 51 +++++++++++++++++-- widget/timer/src/mac/Makefile.in | 16 +++++- xpfe/browser/resources/content/Makefile.in | 4 ++ .../resources/content/Makefile.in | 4 ++ xpfe/global/resources/content/Makefile.in | 4 ++ 8 files changed, 76 insertions(+), 16 deletions(-) diff --git a/config/Makefile.in b/config/Makefile.in index 00cb1672e0b6..fdaf4a17f00f 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -70,10 +70,6 @@ ifeq ($(OS_CONFIG),SunOS4.1) NSPR_CFLAGS += -I$(srcdir)/../nsprpub/pr/include/md endif -ifeq ($(OS_CONFIG),Rhapsody10.0) -NSPR_CFLAGS += -DGETCWD_CANT_MALLOC -endif - HEADERS = nsBuildID.h ifeq ($(MOZ_OS2_TOOLS),VACPP) HEADERS += $(srcdir)/os2/dirent.h diff --git a/config/config.mk b/config/config.mk index 3bef27469e33..ceacebe4b5fe 100644 --- a/config/config.mk +++ b/config/config.mk @@ -132,11 +132,6 @@ ifeq ($(OS_ARCH),OS_2) OS_ARCH := OS2 OS_RELEASE := $(shell uname -v) endif -ifeq ($(OS_ARCH),Mac OS) -ifeq ($(OS_RELEASE),10.0) -OS_ARCH := Rhapsody -endif -endif ifeq ($(OS_ARCH),BeOS) BEOS_ADDON_WORKAROUND = 1 endif diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in index a8b1e81888de..a680e9121ca8 100644 --- a/content/xbl/builtin/Makefile.in +++ b/content/xbl/builtin/Makefile.in @@ -29,8 +29,12 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(OS_ARCH),OS2) DIRS = win else +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +DIRS = mac +else DIRS = unix endif +endif include $(topsrcdir)/config/rules.mk diff --git a/widget/src/mac/Makefile.in b/widget/src/mac/Makefile.in index e85d09b5cb17..6dd092c60fff 100644 --- a/widget/src/mac/Makefile.in +++ b/widget/src/mac/Makefile.in @@ -28,6 +28,32 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetMacModule XPIDL_MODULE = widget +REQUIRES = xpcom \ + gfx \ + string \ + uconv \ + dom \ + webshell \ + docshell \ + plugin \ + content \ + layout \ + view \ + xul \ + necko \ + nkcache \ + locale \ + pref \ + appshell \ + intl \ + timer \ + mimetype \ + $(NULL) + +GFX_LCPPSRCS = \ + nsRegionMac.cpp \ + nsWatchTask.cpp \ + $(NULL) CPPSRCS = nsAppShell.cpp \ nsBidiKeyboard.cpp \ @@ -37,6 +63,7 @@ CPPSRCS = nsAppShell.cpp \ nsDeleteObserver.cpp \ nsDragService.cpp \ nsFilePicker.cpp \ + nsLabel.cpp \ nsLookAndFeel.cpp \ nsMacControl.cpp \ nsMacEventHandler.cpp \ @@ -49,29 +76,43 @@ CPPSRCS = nsAppShell.cpp \ nsMenuBarX.cpp \ nsMenuItemX.cpp \ nsMimeMapper.cpp \ - $(topsrcdir)/gfx/src/mac/nsRegionMac.cpp \ nsScrollbar.cpp \ nsSound.cpp \ nsTextWidget.cpp \ + nsTSMStrategy.cpp \ nsToolkit.cpp \ nsWidgetFactory.cpp \ nsWidgetSupport.cpp \ nsWindow.cpp \ + $(GFX_LCPPSRCS) \ $(NULL) XPIDLSRCS += \ nsIChangeManager.idl \ $(NULL) +GARBAGE += $(GFX_LCPPSRCS) + include $(topsrcdir)/config/rules.mk +export:: $(addprefix $(topsrcdir)/gfx/src/mac/,$(GFX_LCPPSRCS)) + $(INSTALL) $^ . + EXTRA_DSO_LDOPTS += \ $(DIST)/lib/libxpwidgets_s.a \ $(TK_LIBS) \ - -lgkgfx \ $(MOZ_COMPONENT_LIBS) \ + -lgkgfx \ + -ltimer_mac \ $(NULL) -INCLUDES += $(TK_CFLAGS) -I$(topsrcdir)/gfx/src/mac -I$(srcdir)/../xpwidgets \ - -I$(topsrcdir)/widget/timer/src/mac \ - $(NULL) +LOCAL_INCLUDES = \ + $(TK_CFLAGS) \ + -I$(topsrcdir)/gfx/src/mac \ + -I$(srcdir)/../xpwidgets \ + -I$(topsrcdir)/widget/timer/src/mac \ + $(NULL) + +# for "EnterMovies" in nsSound.cpp +LDFLAGS += -framework QuickTime + diff --git a/widget/timer/src/mac/Makefile.in b/widget/timer/src/mac/Makefile.in index ebdc688bb63c..ebf91bfd2007 100644 --- a/widget/timer/src/mac/Makefile.in +++ b/widget/timer/src/mac/Makefile.in @@ -25,16 +25,24 @@ include $(DEPTH)/config/autoconf.mk MODULE = timer LIBRARY_NAME = timer_mac EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +#IS_COMPONENT = 1 MODULE_NAME = nsMacTimerModule +REQUIRES = xpcom \ + gfx \ + $(NULL) + EXPORTS = $(srcdir)/../unix/nsUnixTimerCIID.h +GFX_LCPPSRCS = nsRepeater.cpp + CPPSRCS = nsTimerMac.cpp \ - $(topsrcdir)/gfx/src/mac/nsRepeater.cpp \ nsTimerPeriodical.cpp \ + $(GFX_LCPPSRCS) \ $(NULL) +GARBAGE += $(GFX_LCPPSRCS) + include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_TIMER @@ -44,3 +52,7 @@ EXTRA_DSO_LDOPTS+= \ $(NULL) INCLUDES += -I../../../public + +export:: $(addprefix $(topsrcdir)/gfx/src/mac/, $(GFX_LCPPSRCS)) + $(INSTALL) $^ . + diff --git a/xpfe/browser/resources/content/Makefile.in b/xpfe/browser/resources/content/Makefile.in index 81f5e09e86ae..fdcc076b516c 100644 --- a/xpfe/browser/resources/content/Makefile.in +++ b/xpfe/browser/resources/content/Makefile.in @@ -29,8 +29,12 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(OS_ARCH), OS2) DIRS = win else +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +DIRS = mac +else DIRS = unix endif +endif include $(topsrcdir)/config/rules.mk diff --git a/xpfe/communicator/resources/content/Makefile.in b/xpfe/communicator/resources/content/Makefile.in index ef498abbfbc6..b30d5cd56eb9 100644 --- a/xpfe/communicator/resources/content/Makefile.in +++ b/xpfe/communicator/resources/content/Makefile.in @@ -29,8 +29,12 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = win else +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +DIRS = mac +else DIRS = unix endif +endif include $(topsrcdir)/config/rules.mk diff --git a/xpfe/global/resources/content/Makefile.in b/xpfe/global/resources/content/Makefile.in index 2f61e29a2f6b..ea9b264fe46a 100644 --- a/xpfe/global/resources/content/Makefile.in +++ b/xpfe/global/resources/content/Makefile.in @@ -29,8 +29,12 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = win else +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +DIRS = mac +else DIRS = unix endif +endif include $(topsrcdir)/config/rules.mk