diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-04 09:57:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-04 10:32:52 +0100 |
| commit | 09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c (patch) | |
| tree | 4799a0d716ad8d23bf7efcfb1fd6ba97e84fee9e /extensions/source/activex | |
| parent | use custom target for copying sources (diff) | |
| download | core-09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c.tar.gz core-09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c.zip | |
fix building of so_activex (fdo#46847)
Diffstat (limited to 'extensions/source/activex')
| -rw-r--r-- | extensions/source/activex/idl/Makefile | 48 | ||||
| -rw-r--r-- | extensions/source/activex/so_activex.rc | 2 |
2 files changed, 49 insertions, 1 deletions
diff --git a/extensions/source/activex/idl/Makefile b/extensions/source/activex/idl/Makefile new file mode 100644 index 000000000000..82e4f504ee01 --- /dev/null +++ b/extensions/source/activex/idl/Makefile @@ -0,0 +1,48 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# 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 or as specified alternatively below. 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +include $(GBUILDDIR)/gbuild_simple.mk + +# XXX: I presume that the "$(COM)"=="GCC" case in the original +# extensions/source/activex/msidl/makefile.mk was for the +# use-mingw-on-windows case and thus is not interesting for us. +so_activex.tlb : + midl.exe \ + -tlb $@ \ + -h so_activex.h \ + -iid so_activex_i.c \ + -dlldata so_activex_dll.c \ + -proxy so_activex_p.c \ + -0icf \ + $(INCLUDE) \ + $(SRCDIR)/extensions/source/activex/so_activex.idl + +.DEFAULT_GOAL := all +.PHONY : all +all : so_activex.tlb + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/source/activex/so_activex.rc b/extensions/source/activex/so_activex.rc index adba0ee79f8c..d2a211eb972d 100644 --- a/extensions/source/activex/so_activex.rc +++ b/extensions/source/activex/so_activex.rc @@ -104,7 +104,7 @@ END // Generated from the TEXTINCLUDE 3 resource. // -1 TYPELIB MISC\so_activex.tlb +1 TYPELIB SO_ACTIVEX_TLB_DIR\so_activex.tlb ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED |