Fix bug 533458 - Fix mac and windows trunk builds. r=Standard8
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 22 Dec 2009 19:23:50 +0100
changeset 4583 1667b2b71d7e6c3aec9afe84fe07304be51eb20f
parent 4582 f3b17956ae4c68c7bff6bac9c4591fc8d48819ff
child 4584 838c816cdac1069c66965f91e68141cd731c5f54
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs533458
Fix bug 533458 - Fix mac and windows trunk builds. r=Standard8
calendar/sunbird/app/Makefile.in
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -178,18 +178,34 @@ include $(topsrcdir)/config/static-confi
 EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
+
+ifndef MOZILLA_1_9_1_BRANCH
+ifndef MOZILLA_1_9_2_BRANCH
+
+# OpenGL is required for MOZ_ENABLE_CANVAS3D (only set in m-c build system).
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+OS_LIBS += -framework OpenGL
 endif
 
+ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+OS_LIBS += opengl32.lib
+endif
+
+endif # MOZILLA_1_9_2_BRANCH
+endif # MOZILLA_1_9_1_BRANCH
+
+endif # BUILD_STATIC_LIBS
+
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_SUNBIRD -I$(srcdir)
 else
 RCFLAGS += -DMOZ_SUNBIRD --include-dir $(srcdir)