X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af111fc33841cc8bdc4d6cf027702805333bdd2a..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/makeprog.vc?ds=sidebyside diff --git a/src/makeprog.vc b/src/makeprog.vc index b3eb9138b2..3559c1ca82 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 @@ -17,7 +17,11 @@ WXUSINGDLL=0 !include $(WXDIR)\src\makevc.env -all: $(PROGRAM).exe $(EXTRATARGETS) +!if "$(RM)" == "" +RM= erase +!endif + +all: $(PROGRAM).exe wx: cd $(WXDIR)\src\msw @@ -29,21 +33,45 @@ wxclean: nmake -f makefile.vc clean # cd $(THISDIR) -$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res + +!if "$(wxUSE_GUI)" == "" +wxUSE_GUI=1 +!endif + +!if "$(wxUSE_GUI)" == "1" + +#!if "$(WXUSINGDLL)" == "1" +#DUMMYOBJ= +#!endif + +$(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 + +!else + +$(PROGRAM).exe: $(WXLIB) $(OBJECTS) + $(link) @<< +-out:$(PROGRAM).exe +$(LINKFLAGS) +$(OBJECTS) $(DUMMYOBJ) +$(LIBS) +<< + +!endif + clean: - -erase $(OBJECTS) - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb + -$(RM) $(OBJECTS) + -$(RM) *.exe + -$(RM) *.res + -$(RM) *.map + -$(RM) *.sbr + -$(RM) *.pdb