diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-29 14:09:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-29 14:09:06 +0000 |
| commit | c5fc1c9438af6d66850a89e23a045933646ba3de (patch) | |
| tree | efc33dcd92c2e77b17af56d41c942fcddcf3a86f /goodies | |
| parent | INTEGRATION: CWS rt16 (1.48.6); FILE MERGED (diff) | |
| download | core-c5fc1c9438af6d66850a89e23a045933646ba3de.tar.gz core-c5fc1c9438af6d66850a89e23a045933646ba3de.zip | |
INTEGRATION: CWS ause065 (1.7.116); FILE MERGED
2006/08/14 17:48:03 hjs 1.7.116.1: #i68281# cleanup
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/inv/makefile.mk | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/goodies/source/inv/makefile.mk b/goodies/source/inv/makefile.mk index 8d50cdea691a..082f9f27a140 100644 --- a/goodies/source/inv/makefile.mk +++ b/goodies/source/inv/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-09-09 03:07:29 $ +# last change: $Author: ihi $ $Date: 2006-08-29 15:09:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -46,7 +46,7 @@ TARGETTYPE=GUI # --- Files -------------------------------------------------------- .IF "$(TEST)" != "" -ENVCFLAGS=-DTEST +CDEFS+=-DTEST OBJFILES= \ $(OBJ)$/invader.obj \ $(OBJ)$/invader1.obj \ @@ -74,7 +74,7 @@ RESLIB1SRSFILES=$(SRS)$/invader.srs .IF "$(TEST)"!="" APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/invader.obj +APP1OBJS= $(OBJFILES) APP1STDLIBS= $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ @@ -84,9 +84,6 @@ APP1STDLIBS= $(CPPULIB) \ $(VOSLIB) \ $(SOTLIB) \ $(SVLIB) -APP1LIBS=$(LIBPRE) $(LB)$/invader.lib -APP1STACK= 64000 -APP1DEPN= $(LB)$/invader.lib .ELSE @@ -103,15 +100,7 @@ SHL1STDLIBS+=\ advapi32.lib .ENDIF -.IF "$(GUI)"!="WNT" -SHL1LIBS= $(LIB1TARGET) -.ENDIF - -.IF "$(GUI)"=="WNT" SHL1OBJS=$(SLOFILES) -.ELSE -SHL1LIBS=$(SLB)$/$(TARGET).lib -.ENDIF SHL1DEF=$(MISC)$/$(SHL1TARGET).def @@ -135,7 +124,7 @@ $(BIN)$/applicat.rdb : makefile.mk $(SOLARBINDIR)$/types.rdb .IF "$(GUI)"=="WNT" -$(MISC)$/$(SHL1TARGET).def: makefile.mk $(MISC)$/$(SHL1TARGET).flt +$(MISC)$/$(SHL1TARGET).def: makefile.mk @+echo ------------------------------------------- @+echo DEF-File erstellen $@ @+echo LIBRARY $(DLLNAME) >$@ @@ -146,9 +135,3 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk $(MISC)$/$(SHL1TARGET).flt .ENDIF -$(MISC)$/$(SHL1TARGET).flt: - @+echo $(MISC) - @echo $(@) - @+echo $(@) - @echo Imp >$(@) - |