[Libreoffice-commits] .: 2 commits - sal/prj sal/qa

[Tor Lillqvist]

 sal/prj/build.lst                 |    2 +-
 sal/qa/osl/process/makefile.mk    |   11 +----------
 sal/qa/rtl/doublelock/makefile.mk |    9 +--------
 3 files changed, 3 insertions(+), 19 deletions(-)

New commits:
commit 0e64fa4af71458361e20f7fe65132599fe17aa4e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 12:26:20 2011 +0300

    Use MSVC options only with MSVC

diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index cf78cd5..73360cb 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -38,10 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
     CFLAGS+=/Ob1
 .ENDIF
 
@@ -52,8 +49,6 @@ SHL1IMPLIB=i$(SHL1TARGET)
 DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
-# END ------------------------------------------------------------------
-
 SHL2OBJS=$(SLO)$/osl_process.obj
 SHL2TARGET=osl_process
 SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
@@ -61,8 +56,6 @@ SHL2IMPLIB=i$(SHL2TARGET)
 DEF2NAME=$(SHL2TARGET)
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 
-# END ------------------------------------------------------------------
-
 OBJ3FILES=$(OBJ)$/osl_process_child.obj
 APP3TARGET=osl_process_child
 APP3OBJS=$(OBJ3FILES)
@@ -73,8 +66,6 @@ SHL2DEPN=$(APP3TARGETN) \
          $(BIN)/batch.bat
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-
 SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
 
 # --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 214d8cb..a1d0356 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -44,10 +44,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
     CFLAGS+=/Ob1
 .ENDIF
 
@@ -61,11 +58,7 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
-# END ------------------------------------------------------------------
-
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-
 SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
commit 7abd69d6b4a0b78437704d64a8de40675b1e2f06
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 12:25:37 2011 +0300

    No point building xml2cmp when cross-compiling

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index c0e6a8a..8222001 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa	sal	:	xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
+sa	sal	:	NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
 sa	sal\typesconfig							nmake	-	all	sa_tc sa_inc NULL