X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0492c5a094d1baac126331385d66d2f66aa5db52..c17bcb844883451b564446bf7843e7b3f862fe48:/src/makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index b8166cc439..d73db5b206 100644
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -29,6 +29,8 @@ CPU=i386
 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)
@@ -118,6 +120,10 @@ WXLIBNAME=wx200
 WXLIBNAME=wx
 !endif
 
+!if "$(NEW_WXLIBNAME)" != ""
+WXLIBNAME=$(NEW_WXLIBNAME)
+!endif
+
 !if "$(FINAL)" == "1"
 D=Release
 !else
@@ -131,8 +137,8 @@ D=$(D)DLL
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.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
 
 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
 
+.c.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+
+.cpp.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+