X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..77a1771911ed222ba6861ead327c3735fc16a0b1:/src/makemsc.env diff --git a/src/makemsc.env b/src/makemsc.env index e12f7b692b..b896b1852f 100644 --- a/src/makemsc.env +++ b/src/makemsc.env @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # @@ -20,13 +20,14 @@ WXDIR = $(WXWIN) WXINC = $(WXDIR)\include -WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib +WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib # Suffixes OBJSUFF=obj SRCSUFF=cpp -INC=/I$(WXDIR)\include +#INC=/I$(WXDIR)\include +INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC) # Set this to nothing if using MS C++ 7 ZOPTION=/Z7 @@ -51,7 +52,7 @@ DEBUG_FLAGS= LINK_DEBUG_FLAGS= !endif -LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem $(WXDIR)\src\msw\ctl3d\msvc\ctl3dv2.lib +LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem ole2 $(WXDIR)\lib\msvc15\ctl3dv2.lib !if "$(DLL)" == "0" PCH=WX.PCH