don't use -q option with egrep, Solaris doesn't have it (bug 517145)

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index fe3b248de29bd3e20afff4bada827ceff28439b1..1cc2495852fd669ad64dd8629d9863ade80362f9 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -12,7 +12,7 @@
 RM= erase
 !endif
 
-WXVERSION=232
+WXVERSION=233
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -170,7 +170,13 @@ INCEXT=dll$(INCEXT)
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
+!if "$(wxUSE_GUI)" == "0"
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/base$(INCEXT)
+!else
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT)
+!endif
+
+INC=$(INCTEMP) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib