Some OS/2 customization to make a more presentable statusbar.

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 632816e59b3b49b417da321dbaf5e242979c3ae0..4566c9a4fd21bf50c762428f63578215c42dda99 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
-WXVERSION=21_14
+WXVERSION=23_0
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -124,7 +124,14 @@ 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 \
+  gdi32.lib comdlg32.lib winspool.lib
 D=Debug
 LIBEXT=d
 WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
@@ -137,7 +144,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=
@@ -148,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
@@ -157,6 +176,7 @@ LINK_DEBUG_FLAGS=/RELEASE
 _CRTFLAG=/MD
 !endif
 
+
 !if "$(CRTFLAG)" == ""
 CRTFLAG=$(_CRTFLAG)
 !endif
@@ -207,3 +227,8 @@ $(CPPFLAGS2) /Fo$@ /c $<
 $(CPPFLAGS2) /Fo$@ /c $<
 <<
 
+{}.cpp{$D}.obj:
+       cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+