applied patch 432202 (allow installing in already existing directories)

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index c6ecc09d572bfa2ec09d9a3be5889406b369169e..5baee82b97343bc24a723a6de849692bc0b2f806 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -12,7 +12,7 @@
 RM= erase
 !endif
 
 RM= erase
 !endif
 

-WXVERSION=23_0
+WXVERSION=23_2

 WIN95=1
 
 !if "$(WIN95)" == "0"
 WIN95=1
 
 !if "$(WIN95)" == "0"


@@ -154,12 +154,12 @@ D=$(D)DLL
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
+INC=$(EXTRAINC) -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"
 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"

-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib

 !else
 !else

-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib

 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H


@@ -199,18 +199,18 @@ PCH=
 PRECOMP=
 MAKEPRECOMP=
 !else
 PRECOMP=
 MAKEPRECOMP=
 !else

-  
+

 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else
 PCH=wxvc.pch
 !endif
 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else
 PCH=wxvc.pch
 !endif

-  
+

 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 

-   
+

 
 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
 # If you don't include wxprec.h, use CPPFLAGS2
 
 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
 # If you don't include wxprec.h, use CPPFLAGS2