Skip to content

C
core
Kaydet (Commit) f9c54ae7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Use MSVC options only with MSVC

üst cc21659f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 18 deletions
sal/qa/osl/process/makefile.mk
Dosyayı görüntüle @ f9c54ae7
...@@ -38,10 +38,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -38,10 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
# BEGIN ---------------------------------------------------------------- .IF "$(COM)" == "MSC"
# auto generated Target:testjob by codegen.pl
.IF "$(GUI)" == "WNT"
CFLAGS+=/Ob1 CFLAGS+=/Ob1
.ENDIF .ENDIF
...@@ -52,8 +49,6 @@ SHL1IMPLIB=i$(SHL1TARGET) ...@@ -52,8 +49,6 @@ SHL1IMPLIB=i$(SHL1TARGET)
DEF1NAME=$(SHL1TARGET) DEF1NAME=$(SHL1TARGET)
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
SHL2OBJS=$(SLO)$/osl_process.obj SHL2OBJS=$(SLO)$/osl_process.obj
SHL2TARGET=osl_process SHL2TARGET=osl_process
SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
...@@ -61,8 +56,6 @@ SHL2IMPLIB=i$(SHL2TARGET) ...@@ -61,8 +56,6 @@ SHL2IMPLIB=i$(SHL2TARGET)
DEF2NAME=$(SHL2TARGET) DEF2NAME=$(SHL2TARGET)
SHL2VERSIONMAP = $(PRJ)$/qa$/export.map SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
OBJ3FILES=$(OBJ)$/osl_process_child.obj OBJ3FILES=$(OBJ)$/osl_process_child.obj
APP3TARGET=osl_process_child APP3TARGET=osl_process_child
APP3OBJS=$(OBJ3FILES) APP3OBJS=$(OBJ3FILES)
...@@ -73,8 +66,6 @@ SHL2DEPN=$(APP3TARGETN) \ ...@@ -73,8 +66,6 @@ SHL2DEPN=$(APP3TARGETN) \
$(BIN)/batch.bat $(BIN)/batch.bat
#------------------------------- All object files ------------------------------- #------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
SLOFILES=$(SHL1OBJS) $(SHL2OBJS) SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
......
sal/qa/rtl/doublelock/makefile.mk
Dosyayı görüntüle @ f9c54ae7
...@@ -44,10 +44,7 @@ CXXFLAGS+= $(LFS_CFLAGS) ...@@ -44,10 +44,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN ---------------------------------------------------------------- .IF "$(COM)" == "MSC"
# auto generated Target:testjob by codegen.pl
.IF "$(GUI)" == "WNT"
CFLAGS+=/Ob1 CFLAGS+=/Ob1
.ENDIF .ENDIF
...@@ -61,11 +58,7 @@ SHL1IMPLIB= i$(SHL1TARGET) ...@@ -61,11 +58,7 @@ SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET) DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
#------------------------------- All object files ------------------------------- #------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
SLOFILES=$(SHL1OBJS) SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment