summaryrefslogtreecommitdiff
path: root/vcl/test/makefile.mk
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-12-09 13:22:21 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-12-09 13:22:21 +0000
commit08dd93a4b70962aed0d2b1923b1a73d1d33e0bf3 (patch)
tree71741e6246bc9e4115770a4872a2f01906461feb /vcl/test/makefile.mk
parent3a91fde276caa644d90f02da0e102dd4915fc460 (diff)
CWS-TOOLING: integrate CWS canvas06
2008-11-14 18:59:03 +0100 thb r263697 : Reverted fAlpha setup to previous state, as this was bogus as well - code path is apparently not taken for test, but anyway 2008-11-13 21:32:45 +0100 thb r263663 : WaE fix (and a bad bug as well - int color would have overflown) 2008-11-13 16:51:37 +0100 pl r263654 : remove warnings 2008-11-13 09:46:28 +0100 thb r263623 : #i95317# Fixed typo (thx WaE for finding) 2008-11-12 21:25:19 +0100 thb r263617 : #i96047# call update() on hidden sprite shape as well, to force actual hiding 2008-11-12 21:23:31 +0100 thb r263616 : #i95209# Merge from CWS thb11 - revives canvasbitmap unit tests, fixes nasty corner case in x11 salbmp (for 16bpp) 2008-11-12 21:21:46 +0100 thb r263615 : #i95197# Shuffled code to make valgrind quiet during bmp loading 2008-11-12 21:18:06 +0100 thb r263614 : #i93382# Make --disable-moz build work 2008-11-12 21:16:55 +0100 thb r263613 : #i95317# Fixed mis-named traits methods for min and max numbers 2008-11-12 20:59:01 +0100 thb r263612 : #i95317#, #i92902#: migrate CWS canvas06 to SVN.
Diffstat (limited to 'vcl/test/makefile.mk')
-rw-r--r--vcl/test/makefile.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/vcl/test/makefile.mk b/vcl/test/makefile.mk
index 45f36555c302..4f10be112d2c 100644
--- a/vcl/test/makefile.mk
+++ b/vcl/test/makefile.mk
@@ -46,13 +46,12 @@ TARGETTYPE=GUI
# --- Files --------------------------------------------------------
-OBJFILES= \
+APP1OBJS= \
$(OBJ)$/dndtest.obj
APP1NOSAL= TRUE
APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJFILES) $(OBJ)$/salmain.obj
APP1STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(TOOLSLIB) \
@@ -68,12 +67,6 @@ APP2TARGET= canvasbitmaptest
APP2OBJS= \
$(OBJ)$/canvasbitmaptest.obj
-.IF "$(GUI)"!="UNX"
- APP2OBJS += $(OBJ)$/salmain.obj
-.ELSE
- APP2OBJS += $(SLO)$/salmain.obj
-.ENDIF
-
APP2NOSAL= TRUE
APP2STDLIBS=$(TOOLSLIB) \
$(COMPHELPERLIB) \