X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df801fc6d47a2915768ba386d4b406249e2f56a9..f8c5636c42238296eb67bf73d1da3c5acb010fee:/src/makevc.env diff --git a/src/makevc.env b/src/makevc.env index 03945f4db1..4566c9a4fd 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -8,7 +8,7 @@ # !include -WXVERSION=22_0 +WXVERSION=23_0 WIN95=1 !if "$(WIN95)" == "0" @@ -124,6 +124,10 @@ WXLIBNAME=$(NEW_WXLIBNAME) !if "$(FINAL)" == "1" D=Release +!else if "$(FINAL)" == "hybrid" +D=Hybrid +LIBEXT=h +WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !else guilibsdll= oldnames.lib kernel32.lib \ ws2_32.lib mswsock.lib advapi32.lib user32.lib \ @@ -156,6 +160,13 @@ OPT = /Od /Gy DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE _CRTFLAG=/MDd + +!else if "$(FINAL)" == "hybrid" +OPT = /Od /Gy +DEBUG_FLAGS= /Zi /D__WXDEBUG__ /D__NO_VC_CRTDBG__ +LINK_DEBUG_FLAGS=-debug:full -debugtype:cv +_CRTFLAG=/MD + !else # /O1 - smallest code # /O2 - fastest code @@ -165,6 +176,7 @@ LINK_DEBUG_FLAGS=/RELEASE _CRTFLAG=/MD !endif + !if "$(CRTFLAG)" == "" CRTFLAG=$(_CRTFLAG) !endif @@ -220,6 +232,3 @@ $(CPPFLAGS2) /Fo$@ /c $< $(CPPFLAGS) /Fo$@ /c /Tp $< << -$(D) : - mkdir $(D) -