Added insertion point code to wxComboBox

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 632816e59b3b49b417da321dbaf5e242979c3ae0..d990d01af22dcc8ecf50ebf1447aa6b57627bd95 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

-WXVERSION=21_14
+WXVERSION=22_0

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


@@ -125,6 +125,9 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 !if "$(FINAL)" == "1"
 D=Release
 !else
 !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)
 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)
 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
 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=
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=