From 49c78b42d9269a6ee5eeee91e7f64b6a20a4f3f8 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 17 Dec 2003 17:12:04 +0000
Subject: INTEGRATION: CWS geordi2q11 (1.57.4); FILE MERGED 2003/12/16 16:14:21
 hr 1.57.4.1: #111934#: join CWS ooo111fix1

---
 solenv/inc/wnt.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'solenv/inc/wnt.mk')

diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index be12f9d377c1..77ca51dbb4f3 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: wnt.mk,v $
 #
-#   $Revision: 1.58 $
+#   $Revision: 1.59 $
 #
-#   last change: $Author: vg $ $Date: 2003-12-16 11:40:27 $
+#   last change: $Author: vg $ $Date: 2003-12-17 18:12:04 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,7 +60,7 @@
 #
 #*************************************************************************
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 FULL_DESK=TRUE
 JAVAFLAGSDEBUG=-g
 
@@ -177,6 +177,8 @@ CFLAGS+=-c -nologo -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE)
 CFLAGS+= -Ob1
 .ENDIF	# "$(VC_STANDARD)"==""
 .ENDIF
+.ENDIF
+.ENDIF
 .ELSE	# ist keine product...
 CDEFS+= -D_X86_=1 $(OLE2DEF)
 CFLAGS+=-c -nologo -Gs $(NOLOGO) $(MINUS_I)$(INCLUDE)
-- 
cgit