fixed wrong assert

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 28a66ef729dd17b115af548806398ed84bb165e7..d73db5b206f1d38a66cc9423cc4e0ad6c8f3ddb6 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -29,6 +29,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)


@@ -118,6 +120,10 @@ WXLIBNAME=wx200
 WXLIBNAME=wx
 !endif
 
 WXLIBNAME=wx
 !endif
 

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

 !if "$(FINAL)" == "1"
 D=Release
 !else
 !if "$(FINAL)" == "1"
 D=Release
 !else


@@ -132,7 +138,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=


@@ -188,3 +194,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 $<
+<<
+