diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:05:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:05:46 +0000 |
| commit | 70b125cf3510eba278cbfe732d459426326d246b (patch) | |
| tree | beeba2f71bcd65d8ebc2134272dcb2877f23fd16 /extensions/source | |
| parent | 0684cb60678b25ef13cf71371f72fdb7566a2df5 (diff) | |
INTEGRATION: CWS mingwport03 (1.4.348); FILE MERGED
2006/11/07 17:49:20 vg 1.4.348.2: RESYNC: (1.4-1.6); FILE MERGED
2006/09/06 14:08:41 vg 1.4.348.1: #i53572# MinGW port
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/activex/msidl/makefile.mk | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/extensions/source/activex/msidl/makefile.mk b/extensions/source/activex/msidl/makefile.mk index 1e83bbf03..c0a0fdd7a 100644 --- a/extensions/source/activex/msidl/makefile.mk +++ b/extensions/source/activex/msidl/makefile.mk @@ -1,12 +1,12 @@ #************************************************************************** # -# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/activex/msidl/makefile.mk,v 1.6 2006-10-30 08:08:42 rt Exp $ +# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/activex/msidl/makefile.mk,v 1.7 2007-03-26 13:05:46 vg Exp $ # # ========================================================================= # -# $Date: 2006-10-30 08:08:42 $ -# $Author: rt $ -# $Revision: 1.6 $ +# $Date: 2007-03-26 13:05:46 $ +# $Author: vg $ +# $Revision: 1.7 $ # # ========================================================================= # @@ -38,8 +38,15 @@ SOURCE=so_activex.idl MTL_SWITCHES=-tlb $(MISC)$/so_activex.tlb -h $(MISC)$/so_activex.h -iid $(MISC)$/so_activex_i.c -dlldata $(MISC)$/so_activex_dll.c -proxy $(MISC)$/so_activex_p.c -Oicf +.IF "$(COM)"=="GCC" +MTL_SWITCHES+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell cygpath -w $(PSDK_HOME)/include)" + +$(MISC)$/activex_component : $(SOURCE) + $(MTL) $(MTL_SWITCHES) -I $(shell cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE) +.ELSE $(MISC)$/activex_component : $(SOURCE) $(WRAPCMD) $(MTL) $(MTL_SWITCHES) $(INCLUDE) $(SOURCE) && $(TOUCH) $@ +.ENDIF .ENDIF |