X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e1ed7d709cf4e81556589a8c2132882f40d97ff..7e99520bd3fc092bbbcbc38bb699a0236618ea40:/src/makeprog.vc diff --git a/src/makeprog.vc b/src/makeprog.vc index 5c17936e4f..1db976b6d5 100644 --- a/src/makeprog.vc +++ b/src/makeprog.vc @@ -10,7 +10,7 @@ # Use FINAL=1 argument to nmake to build final version with no debugging # info -# Set WXDIR for your system (hint, set an environment variable named WXWIN) +# Set WXDIR for your system WXDIR = $(WXWIN) WXUSINGDLL=0 @@ -29,16 +29,16 @@ wxclean: nmake -f makefile.vc clean # cd $(THISDIR) -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res +$(PROGRAM).exe: $(WXLIB) $(OBJECTS) $(PROGRAM).res $(link) @<< -out:$(PROGRAM).exe $(LINKFLAGS) -$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res +$(OBJECTS) $(DUMMYOBJ) $(PROGRAM).res $(LIBS) << $(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc + $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc clean: -erase $(OBJECTS)