Bug 680753 - LNK2019 unresolved external symbol errors during Calendar Sunbird build [r=philipp]
authorEdmund Wong <ewong@pw-wspx.org>
Sun, 04 Sep 2011 12:58:54 +0200
changeset 9107 532f8dc064df021d21b35d04f704d7848f72d34d
parent 9106 2e6c207c7857aecbbedbe3cea8ee5bffd9f15cc3
child 9108 9eba3b1b217b8c02c394f22be2664edf431b761d
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs680753
Bug 680753 - LNK2019 unresolved external symbol errors during Calendar Sunbird build [r=philipp]
calendar/confvars.sh
calendar/sunbird/app/Makefile.in
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -49,12 +49,8 @@ MOZ_INSTALLER=
 MOZ_MATHML=
 MOZ_EXTENSIONS_DEFAULT=
 MOZ_UNIVERSALCHARDET=
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/sunbird/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 SUNBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/sunbird
-
-# Until we can build with libxul, we can't have ipc either
-MOZ_ENABLE_LIBXUL=
-MOZ_IPC=
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -77,18 +77,16 @@ endif
 SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 ifdef SOURCE_REPO
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
  
 ifndef LIBXUL_SDK
 # Build a binary bootstrapping with XRE_main
 
-MOZILLA_INTERNAL_API = 1
-
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
 
 CPPSRCS = nsCalendarApp.cpp
@@ -115,22 +113,17 @@ endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 ifdef BUILD_STATIC_LIBS
 TK_LIBS := -framework SystemConfiguration -framework CoreAudio -framework AudioToolbox -framework AudioUnit $(TK_LIBS)
 endif
 endif
 
-ifdef MOZ_ENABLE_LIBXUL
 APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
-else
-MOZILLA_INTERNAL_API = 1
-APP_XPCOM_LIBS = $(XPCOM_LIBS)
-endif
 
 LIBS += \
 	$(STATIC_COMPONENTS_LINKER_PATH) \
 	$(EXTRA_DSO_LIBS) \
 	$(APP_XPCOM_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)