X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7be1f0d91a912a73b110157170124830446e15e1..f3ff38139d1a9f285f25e5a70cb0f5ad301fd897:/src/makeprog.wat diff --git a/src/makeprog.wat b/src/makeprog.wat index 0a1784aa5d..99b984842e 100644 --- a/src/makeprog.wat +++ b/src/makeprog.wat @@ -5,7 +5,7 @@ WXDIR = $(%WXWIN) WXLIB = $(WXDIR)\lib LNK = $(PROGRAM).lnk -all: $(PROGRAM).exe +all: $(PROGRAM).exe $(EXTRATARGETS) $(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib wlink @$(LNK) @@ -20,13 +20,20 @@ $(LNK) : makefile.wat @%append $(LNK) system $(LINKOPTION) @%append $(LNK) $(STACK) @%append $(LNK) name $(PROGRAM).exe - @%append $(LNK) file $(WXLIB)\wx.lib @for %i in ($(OBJECTS)) do @%append $(LNK) file %i - -# @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i + @for %i in ($(LIBS)) do @%append $(LNK) lib %i + @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i # @%append $(LNK) $(MINDATA) # @%append $(LNK) $(MAXDATA) clean: .SYMBOLIC - -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe + -erase *.obj + -erase *.bak + -erase *.err + -erase *.pch + -erase *.lib + -erase $(LNK) + -erase *.res + -erase *.exe + -erase *.lbc