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 | f9c54ae7f8b537c669b898ffcd189f87eecf0117 (patch) | |
| tree | f6fcd72752ce96dc7bfce1f16f4521906c500bdb /sal | |
| parent | cc21659f0eb8ef6207c8f921b7d7e0c6a1d310a0 (diff) | |
Use MSVC options only with MSVC
Diffstat (limited to 'sal')
| -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 cf78cd5f5f6c..73360cbd04d9 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 214d8cb58407..a1d03567306f 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 ------------------------------------------------------ |