MSW Caret is now destroyed and recreated when resized.

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index d73db5b206f1d38a66cc9423cc4e0ad6c8f3ddb6..e3b18529c74fc99eafc1a2fdc7d79ec83858bb28 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -1,5 +1,5 @@
 #
 #

-# File:                ntwxwin.env
+# File:                makevc.env

 # Author:      Ulrich Leodolter
 # Created:     Wed May 17 08:36:42 1995
 # Updated:
 # Author:      Ulrich Leodolter
 # Created:     Wed May 17 08:36:42 1995
 # Updated:


@@ -8,6 +8,7 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

+WXVERSION=21_12

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


@@ -41,7 +42,7 @@ 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
 
 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
 

-# Change this to your WXWIN directory
+# Set a WXWIN environment variable be the path to your WXWIN directory

 WXDIR=$(WXWIN)
 
 WXSRC=$(WXDIR)\src\msw
 WXDIR=$(WXWIN)
 
 WXSRC=$(WXDIR)\src\msw


@@ -55,9 +56,9 @@ WXBASESRC=$(WXDIR)\src\common
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #

-# wxWin as DLL          Defined      -           Defined      wx200.lib
+# wxWin as DLL          Defined      -           Defined      wx$(WXVERSION).lib

 #
 #

-# App using wxWin DLL   -            Defined     -            wx200.lib
+# App using wxWin DLL   -            Defined     -            wx$(WXVERSION).lib

 #
 # App built as one DLL  Defined      -           -            wx.lib
 #
 #
 # App built as one DLL  Defined      -           -            wx.lib
 #


@@ -112,10 +113,10 @@ NOPCH=0
 
 # This sets 'D' to a suitable directory name
 # for this kind of build, and WXLIBNAME to one of wx (static release), wx_d (static debug),
 
 # This sets 'D' to a suitable directory name
 # for this kind of build, and WXLIBNAME to one of wx (static release), wx_d (static debug),

-# wx200 (DLL release), wx200_d (DLL debug)
+# wx$(WXVERSION) (DLL release), wx$(WXVERSION)_d (DLL debug)

 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"

-WXLIBNAME=wx200
+WXLIBNAME=wx$(WXVERSION)

 !else
 WXLIBNAME=wx
 !endif
 !else
 WXLIBNAME=wx
 !endif


@@ -128,7 +129,8 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 D=Release
 !else
 D=Debug
 D=Release
 !else
 D=Debug

-WXLIBNAME=$(WXLIBNAME)_d
+LIBEXT=_d
+WXLIBNAME=$(WXLIBNAME)$(LIBEXT)

 !endif
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 !endif
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"


@@ -137,8 +139,8 @@ D=$(D)DLL
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\xpm.lib
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\xpm.lib

 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=


@@ -148,14 +150,18 @@ OPT = /Od /Gy
 # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated
 DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR
 LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
 # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated
 DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR
 LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE

-CRTFLAG=/MD
+_CRTFLAG=/MDd

 !else
 # /O1 - smallest code
 # /O2 - fastest code
 OPT = /O1 # /O2 # /Od
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
 !else
 # /O1 - smallest code
 # /O2 - fastest code
 OPT = /O1 # /O2 # /Od
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE

-CRTFLAG=/MD
+_CRTFLAG=/MD
+!endif
+
+!if "$(CRTFLAG)" == ""
+CRTFLAG=$(_CRTFLAG)

 !endif
 
 !if "$(DLL)" == "0"
 !endif
 
 !if "$(DLL)" == "0"