X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..1be06faf7318abf88a35b299b90ceb2a49c0353b:/src/makevc.env diff --git a/src/makevc.env b/src/makevc.env index 189d215d2e..1922707f70 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -140,7 +140,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= @@ -210,3 +215,8 @@ $(CPPFLAGS2) /Fo$@ /c $< $(CPPFLAGS2) /Fo$@ /c $< << +{}.cpp{$D}.obj: + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $< +<< +