fixed bug in wxHtmlWindow: HistoryBack/Forward now correctly preserves last entry...

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 6fd9a89980573af6a0dfbc75881589d40be7593c..1922707f70660437a775e1b263b9dae7797eb078 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
-WXVERSION=21_14
+WXVERSION=22_0
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -34,7 +34,7 @@ WAITFLAG=/w
 
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
 #WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
-WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
+WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
  comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
@@ -125,6 +125,9 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 !if "$(FINAL)" == "1"
 D=Release
 !else
+guilibsdll= oldnames.lib kernel32.lib \
+  ws2_32.lib mswsock.lib advapi32.lib user32.lib \
+  gdi32.lib comdlg32.lib winspool.lib
 D=Debug
 LIBEXT=d
 WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
@@ -137,7 +140,12 @@ D=$(D)DLL
 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)
+
+!if "$(WXUSINGDLL)" == "1"
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
+!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
+!endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=
@@ -207,3 +215,8 @@ $(CPPFLAGS2) /Fo$@ /c $<
 $(CPPFLAGS2) /Fo$@ /c $<
 <<
 
+{}.cpp{$D}.obj:
+       cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+