Skip to content

C
core
Kaydet (Commit) 5f35d2cf authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov
Dosyalara gözat
Seçenekler

#100000# merge problem fix

üst 49c78b42
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
solenv/inc/wnt.mk
Dosyayı görüntüle @ 5f35d2cf
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: wnt.mk,v $ # $RCSfile: wnt.mk,v $
# #
# $Revision: 1.59 $ # $Revision: 1.60 $
# #
# last change: $Author: vg $ $Date: 2003-12-17 18:12:04 $ # last change: $Author: vg $ $Date: 2003-12-18 10:58:18 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -177,8 +177,6 @@ CFLAGS+=-c -nologo -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE) ...@@ -177,8 +177,6 @@ CFLAGS+=-c -nologo -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE)
CFLAGS+= -Ob1 CFLAGS+= -Ob1
.ENDIF # "$(VC_STANDARD)"=="" .ENDIF # "$(VC_STANDARD)"==""
.ENDIF .ENDIF
.ENDIF
.ENDIF
.ELSE # ist keine product... .ELSE # ist keine product...
CDEFS+= -D_X86_=1 $(OLE2DEF) CDEFS+= -D_X86_=1 $(OLE2DEF)
CFLAGS+=-c -nologo -Gs $(NOLOGO) $(MINUS_I)$(INCLUDE) CFLAGS+=-c -nologo -Gs $(NOLOGO) $(MINUS_I)$(INCLUDE)
......
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