diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-22 08:25:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-22 08:25:18 +0000 |
| commit | 9f2b2b3e05148f23e0dc19c61549c06b3c193c8f (patch) | |
| tree | 244381cf6329e1841c69c795c1bc861bef201023 /extensions/source/activex/main/makefile.mk | |
| parent | 59552441aee8577182d9186eafd9ed158b19f7c2 (diff) | |
INTEGRATION: CWS obo02 (1.2.90); FILE MERGED
2003/05/14 15:39:15 mav 1.2.90.1: #i14324# adopt to new atl version
Diffstat (limited to 'extensions/source/activex/main/makefile.mk')
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index bca74d8769b0..597c9b006716 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -1,12 +1,12 @@ #************************************************************************** # -# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/activex/main/makefile.mk,v 1.2 2002-10-25 17:05:13 hjs Exp $ +# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/activex/main/makefile.mk,v 1.3 2003-05-22 09:25:18 vg Exp $ # # ========================================================================= # -# $Date: 2002-10-25 17:05:13 $ -# $Author: hjs $ -# $Revision: 1.2 $ +# $Date: 2003-05-22 09:25:18 $ +# $Author: vg $ +# $Revision: 1.3 $ # # ========================================================================= # @@ -32,7 +32,8 @@ use_shl_versions= VERSIONOBJ= LIBTARGET=NO USE_DEFFILE=YES -INCPRE+=$(SOLARINCDIR)$/external$/atl \ + +INCPRE+=$(ATL_INCLUDE) \ -I$(MISC) \ # --- Files ------------------------------------- @@ -63,6 +64,11 @@ SHL1STDLIBS=\ urlmon.lib \ Shlwapi.lib +.IF "$(COMEX)"=="8" + SHL1STDLIBS+= $(COMPATH)$/atlmfc$/lib$/atls.lib +.ENDIF + + # kernel32.lib \ # rpcndr.lib \ # rpcns4.lib \ |