diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-14 12:26:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-14 12:26:20 +0300 |
| commit | 0e64fa4af71458361e20f7fe65132599fe17aa4e (patch) | |
| tree | 26042a607e8074b89c57c39283440b37efb253dc | |
| parent | 7abd69d6b4a0b78437704d64a8de40675b1e2f06 (diff) | |
Use MSVC options only with MSVC
| -rw-r--r-- | sal/qa/osl/process/makefile.mk | 11 | ||||
| -rw-r--r-- | sal/qa/rtl/doublelock/makefile.mk | 9 |
2 files changed, 2 insertions, 18 deletions
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk index cf78cd5f5..73360cbd0 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 214d8cb58..a1d035673 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 ------------------------------------------------------ |