X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50c375d311ac4cefbf1ae1d11e19c9e7c00a873e..ee495e4cab0139e65ac7a9867a57cef600e5c24b:/src/makeprog.vc diff --git a/src/makeprog.vc b/src/makeprog.vc index bb9ae460b5..1db976b6d5 100644 --- a/src/makeprog.vc +++ b/src/makeprog.vc @@ -2,7 +2,7 @@ # File: makefile.nt # Author: Julian Smart # Created: 1999 -# Updated: +# Updated: # Copyright: (c) Julian Smart # # Makefile environment for building samples. Include this from @@ -11,13 +11,13 @@ # info # Set WXDIR for your system -WXDIR = j:\dev\wx2\wxWindows +WXDIR = $(WXWIN) WXUSINGDLL=0 !include $(WXDIR)\src\makevc.env -all: $(PROGRAM).exe $(EXTRATARGETS) +all: $(PROGRAM).exe wx: cd $(WXDIR)\src\msw @@ -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)