diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:17:31 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:17:31 +0000 |
| commit | 30f2f901f845ae2b31f763bd1ddd11814d094033 (patch) | |
| tree | 2489f4b069501dcace72a231e0586b83a2a81b6a /setup_native/source/win32/customactions/reg4msdoc/makefile.mk | |
| parent | d0be9bc0435362674c4db1f94b862128fc3ef72f (diff) | |
INTEGRATION: CWS ause036 (1.1.96); FILE MERGED
2006/06/06 12:05:24 hjs 1.1.96.4: #i53507# damaged on resync
2006/02/27 17:30:50 hjs 1.1.96.3: RESYNC: (1.2-1.3); FILE MERGED
2005/09/13 10:55:01 hjs 1.1.96.2: RESYNC: (1.1-1.2); FILE MERGED
2005/08/18 15:18:54 hjs 1.1.96.1: #i53507# cleanup
Diffstat (limited to 'setup_native/source/win32/customactions/reg4msdoc/makefile.mk')
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/makefile.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk index bad5e7f266fe..922a547b7a19 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk +++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: kz $ $Date: 2006-01-06 11:20:07 $ +# last change: $Author: ihi $ $Date: 2006-06-29 11:17:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,8 +37,6 @@ PRJ=..$/..$/..$/.. PRJNAME=setup_native TARGET=reg4msdocmsi -.IF "$(GUI)"=="WNT" - # --- Settings ----------------------------------------------------- ENABLE_EXCEPTIONS=TRUE @@ -48,13 +46,12 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -#STDSHL= -# SOLARINC!:=$(SOLARINC:s/stl//) - CFLAGS+=-DUNICODE -D_UNICODE -D_STLP_USE_STATIC_LIB # --- Files -------------------------------------------------------- +.IF "$(GUI)"=="WNT" + UWINAPILIB= SLOFILES = $(SLO)$/msihelper.obj\ @@ -90,12 +87,11 @@ SHL1BASE = 0x1c000000 DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.ENDIF + # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - -.ENDIF - |