diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:16:37 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:16:37 +0000 |
| commit | 3dbacd87487b60bd6725e488161dcb62018263de (patch) | |
| tree | 06b7168d69653a256e9a79f15475fca4ec7c40d3 /setup_native | |
| parent | 558635105d1db7e10380b2acb2126d1fc909fc89 (diff) | |
INTEGRATION: CWS ause036 (1.1.96); FILE MERGED
2005/09/13 10:56:30 hjs 1.1.96.2: RESYNC: (1.1-1.2); FILE MERGED
2005/08/18 15:18:51 hjs 1.1.96.1: #i53507# cleanup
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/javafilter/makefile.mk | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk index e205c1b58134..58a828f4d4aa 100644 --- a/setup_native/source/win32/customactions/javafilter/makefile.mk +++ b/setup_native/source/win32/customactions/javafilter/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2005-09-07 16:31:56 $ +# last change: $Author: ihi $ $Date: 2006-06-29 11:16:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -34,43 +34,32 @@ #************************************************************************* PRJ=..$/..$/..$/.. -PRJNAME=setup2 +PRJNAME=setup_native TARGET=jfregca -.IF "$(GUI)"=="WNT" # --- Settings ----------------------------------------------------- -# NO_DEFAULT_STL=TRUE +NO_DEFAULT_STL=TRUE ENABLE_EXCEPTIONS=TRUE +DYNAMIC_CRT= -#.INCLUDE : svpre.mk .INCLUDE : settings.mk -#.INCLUDE : sv.mk - -STDSHL= -# SOLARINC!:=$(SOLARINC:s/stl//) # --- Files -------------------------------------------------------- -INCPRE+=.\Include -.DIRCACHE=NO -# CFLAGS+=-E +.IF "$(GUI)"=="WNT" -SLOFILES = $(SLO)$/jfregca.obj +UWINAPILIB= -SHL1STDLIBS= kernel32.lib\ - user32.lib\ - advapi32.lib\ - shell32.lib\ - msi.lib\ - libcmt.lib -# msvcrt.lib +SLOFILES = $(SLO)$/jfregca.obj +STDSHL += \ + advapi32.lib\ + msi.lib SHL1LIBS = $(SLB)$/$(TARGET).lib -#SHL1TARGET = $(TARGET)$(UPD)$(DLLPOSTFIX) SHL1TARGET = $(TARGET) SHL1IMPLIB = i$(TARGET) @@ -80,12 +69,10 @@ SHL1BASE = 0x1c000000 DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.ENDIF # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - -.ENDIF - |