diff --git a/mozilla/calendar/libxpical/makefile.win b/mozilla/calendar/libxpical/makefile.win new file mode 100644 index 00000000000..4a392adffc4 --- /dev/null +++ b/mozilla/calendar/libxpical/makefile.win @@ -0,0 +1,70 @@ +# ***** 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 mozilla.org code. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 2001 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# 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=..\.. + +MODULE = calendar +XPIDL_MODULE = calendar + +REQUIRES = xpcom \ + appshell \ + string \ + libical \ + libicalss \ + libicalvcal \ + $(NULL) +include <$(DEPTH)/config/config.mak> + +LIBRARY_NAME = xpical +MODULE_NAME = oeICalModule + +XPIDLSRCS = .\oeIICal.idl + +OBJS = \ + .\$(OBJDIR)\oeICalEventImpl.obj \ + .\$(OBJDIR)\oeICalFactory.obj \ + .\$(OBJDIR)\oeICalImpl.obj \ + .\$(OBJDIR)\oeICalStartupHandler.obj \ + $(NULL) + +LLIBS = \ + $(DIST)\lib\libical$(MOZ_BITS)$(VERSION_NUMBER).lib \ + $(DIST)\lib\libicalss$(MOZ_BITS)$(VERSION_NUMBER).lib \ + $(DIST)\lib\xpcom.lib \ + $(LIBNSPR) \ + $(NULL) + +include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/calendar/libxpical/oeICalEventImpl.cpp b/mozilla/calendar/libxpical/oeICalEventImpl.cpp index 3289926f30b..2df278b8d61 100644 --- a/mozilla/calendar/libxpical/oeICalEventImpl.cpp +++ b/mozilla/calendar/libxpical/oeICalEventImpl.cpp @@ -34,7 +34,9 @@ * * ***** END LICENSE BLOCK ***** */ +#ifndef WIN32 #include +#endif #include "oeICalEventImpl.h" #include "nsMemory.h" diff --git a/mozilla/calendar/libxpical/oeICalImpl.cpp b/mozilla/calendar/libxpical/oeICalImpl.cpp index 6da75710cf4..939fcd9dec4 100644 --- a/mozilla/calendar/libxpical/oeICalImpl.cpp +++ b/mozilla/calendar/libxpical/oeICalImpl.cpp @@ -34,7 +34,9 @@ * * ***** END LICENSE BLOCK ***** */ +#ifndef WIN32 #include +#endif #define __cplusplus__ 1 diff --git a/mozilla/calendar/makefile.win b/mozilla/calendar/makefile.win index 9073f59c394..efdef16c0e8 100644 --- a/mozilla/calendar/makefile.win +++ b/mozilla/calendar/makefile.win @@ -36,7 +36,7 @@ DEPTH=.. -DIRS=resources +DIRS=libxpical resources include <$(DEPTH)\config\rules.mak>