diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:42:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:42:28 +0000 |
| commit | e147039977794bf73dcb3288d8358a9adf496671 (patch) | |
| tree | 706d854ae92b9476e17b5afbd47b75a1130b9f40 /vcl/test | |
| parent | 24e64b0157adb869f2ee62b556e0ebbaf7fee1df (diff) | |
INTEGRATION: CWS canvas05 (1.8.12); FILE MERGED
2008/04/21 07:48:00 thb 1.8.12.3: RESYNC: (1.9-1.10); FILE MERGED
2008/01/22 00:52:28 thb 1.8.12.2: RESYNC: (1.8-1.9); FILE MERGED
2007/10/01 13:40:14 thb 1.8.12.1: #i78888# #i78925# #i79258# #i79437# #i79846# Merge from CWS picom
Diffstat (limited to 'vcl/test')
| -rw-r--r-- | vcl/test/makefile.mk | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/vcl/test/makefile.mk b/vcl/test/makefile.mk index bacb0082b4c1..45f36555c302 100644 --- a/vcl/test/makefile.mk +++ b/vcl/test/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # # This file is part of OpenOffice.org. # @@ -29,14 +29,12 @@ # #************************************************************************* -# any volunteer to remove warnings? -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - PRJ=.. PRJNAME=vcl TARGET=dndtest LIBTARGET=NO +ENABLE_EXCEPTIONS=TRUE .IF "$(GUI)" == "OS2" TARGETTYPE=GUI @@ -54,7 +52,7 @@ OBJFILES= \ APP1NOSAL= TRUE APP1TARGET= $(TARGET) -APP1OBJS= $(OBJFILES) $(OBJ)$/salmain.obj +APP1OBJS= $(OBJFILES) $(OBJ)$/salmain.obj APP1STDLIBS= $(CPPULIB) \ $(CPPUHELPERLIB) \ $(TOOLSLIB) \ @@ -66,5 +64,26 @@ APP1STDLIBS= $(CPPULIB) \ # --- Targets ------------------------------------------------------ +APP2TARGET= canvasbitmaptest +APP2OBJS= \ + $(OBJ)$/canvasbitmaptest.obj + +.IF "$(GUI)"!="UNX" + APP2OBJS += $(OBJ)$/salmain.obj +.ELSE + APP2OBJS += $(SLO)$/salmain.obj +.ENDIF + +APP2NOSAL= TRUE +APP2STDLIBS=$(TOOLSLIB) \ + $(COMPHELPERLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(UCBHELPERLIB) \ + $(SALLIB) \ + $(VCLLIB) + +# --- Targets ------------------------------------------------------ + .INCLUDE : target.mk |