wxDialogs now use GTK_WINDOW_DIALOG,

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 28a66ef729dd17b115af548806398ed84bb165e7..a80c82b67fadd9c9954e734026c2883639f8155f 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=21b10

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


@@ -29,6 +30,8 @@ CPU=i386
 OBJSUFF=obj
 SRCSUFF=cpp
 
 OBJSUFF=obj
 SRCSUFF=cpp
 

+WAITFLAG=/w
+

 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
 #WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
 WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
 #WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
 WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)


@@ -53,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
 #


@@ -110,19 +113,24 @@ 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
 

+!if "$(NEW_WXLIBNAME)" != ""
+WXLIBNAME=$(NEW_WXLIBNAME)
+!endif
+

 !if "$(FINAL)" == "1"
 D=Release
 !else
 D=Debug
 !if "$(FINAL)" == "1"
 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"


@@ -132,7 +140,7 @@ D=$(D)DLL
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)
 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\xpm.lib
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\xpm.lib

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


@@ -142,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"


@@ -188,3 +200,13 @@ LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll #
 
 DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
 
 
 DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
 

+.c.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+
+.cpp.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+