diff options
| author | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-11-03 18:41:58 +0100 |
|---|---|---|
| committer | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-11-03 18:41:58 +0100 |
| commit | 5e7c825443690d72576555f1c5cbcd9a945a68bd (patch) | |
| tree | 56bee340b59c2d216da362c831ac38b1e27959a9 /testshl2 | |
| parent | c96f13de01f8adca559973c73faa8f5686567572 (diff) | |
some fixes for warnings and errors found while building on more platforms
Diffstat (limited to 'testshl2')
| -rwxr-xr-x[-rw-r--r--] | testshl2/source/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/testshl2/source/makefile.mk b/testshl2/source/makefile.mk index 20dc6fb6fb67..ab0d9685e667 100644..100755 --- a/testshl2/source/makefile.mk +++ b/testshl2/source/makefile.mk @@ -68,18 +68,18 @@ APP1TARGET= $(TARGET) APP1OBJS= $(COMMON_OBJFILES) $(TESTSHL_OBJFILES) APP1RPATH=NONE -APP1STDLIBS=$(SALLIB) \ - $(CPPUNITLIB) +APP1STDLIBS=$(SALLIB) .IF "$(GUI)" == "WNT" .IF "$(COM)" == "GCC" APP1STDLIBS+= \ - $(LB)$/testshl2$(DLLPOSTFIX).a \ + $(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \ $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \ $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \ $(LB)$/libc5t_winstuff$(DLLPOSTFIX).a .ELSE APP1LIBS= \ + $(SOLARLIBDIR)$/cppunit.lib \ $(LB)$/c5t_testresult.lib \ $(LB)$/c5t_no_regallfkt.lib \ $(LB)$/c5t_winstuff.lib @@ -88,6 +88,7 @@ APP1LIBS= \ .IF "$(GUI)" == "OS2" APP1LIBS= \ + $(SOLARLIBDIR)$/cppunit.lib \ $(LB)$/c5t_no_regallfkt.lib \ $(LB)$/c5t_testresult.lib .ENDIF @@ -95,7 +96,8 @@ APP1LIBS= \ .IF "$(GUI)" == "UNX" APP1STDLIBS+= \ $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \ - $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a + $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \ + $(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a .ENDIF # |