Backing out the patch for
bug 350616 to see if it will fix the windows orange
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is the Mozilla browser.
#
# The Initial Developer of the Original Code is
# Netscape Communications, Inc.
# Portions created by the Initial Developer are Copyright (C) 2001
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Adam Lock <adamlock@eircom.net>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mozctl
RESFILE = MozillaControl.res
DEFFILE = L_mozctl.def
FORCE_SHARED_LIB= 1
REQUIRES = \
xpcom \
string \
js \
widget \
gfx \
view \
necko \
pref \
webbrwsr \
docshell \
dom \
uriloader \
layout \
content \
editor \
webshell \
profile \
embed_base \
necko \
windowwatcher \
webbrowserpersist \
exthandler \
mimetype \
composer \
commandhandler \
ax_common \
locale \
$(NULL)
CPPSRCS = \
StdAfx.cpp \
MozillaControl.cpp \
MozillaBrowser.cpp \
WebBrowserContainer.cpp \
IEHtmlDocument.cpp \
DropTarget.cpp \
PropertyDlg.cpp \
PromptService.cpp \
HelperAppDlg.cpp \
WindowCreator.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(DEPTH)/embedding/base/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
../common/$(LIB_PREFIX)ax_common_s.$(LIB_SUFFIX) \
$(MOZ_UNICHARUTIL_LIBS) \
$(XPCOM_GLUE_LDOPTS) \
$(XPCOM_FROZEN_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
OS_LIBS += \
comdlg32.lib \
ole32.lib \
oleaut32.lib \
uuid.lib \
shell32.lib \
$(NULL)
MIDL_GENERATED_FILES = MozillaControl_i.c MozillaControl.h
GARBAGE += $(DEFFILE) $(MIDL_GENERATED_FILES) done_gen
ENABLE_CXX_EXCEPTIONS = 1
EMBED_MANIFEST_AT = 2
include $(topsrcdir)/config/rules.mk
CXXFLAGS += -D "WIN32" -U "ClientWallet"
LDFLAGS += -SUBSYSTEM:windows -DLL
ifdef MOZ_NO_DEBUG_RTL
DEFINES += -DMOZ_NO_DEBUG_RTL
endif
DEFINES += -DMOZ_ACTIVEX_CONTROL_SUPPORT
LOCAL_INCLUDES += -I.
export:: $(DEFFILE) done_gen
$(DEFFILE): mkctldef.sh
$(srcdir)/mkctldef.sh $@
done_gen: MozillaControl.idl
$(MIDL) $(MIDL_FLAGS) -Oicf -h MozillaControl.h -iid MozillaControl_i.c $(srcdir)/MozillaControl.idl
touch $@
$(MIDL_GENERATED_FILES): done_gen