X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a2c6ef8d186df490df28a694820a5e8afc4b5e8..bbc3925a8a46e8c80b22277f5571dfb2465aca25:/src/makeprog.wat diff --git a/src/makeprog.wat b/src/makeprog.wat index c36dce6abf..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,9 +20,9 @@ $(LNK) : makefile.wat @%append $(LNK) system $(LINKOPTION) @%append $(LNK) $(STACK) @%append $(LNK) name $(PROGRAM).exe - @%append $(LNK) file $(WXLIB)\wx.lib - @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i @for %i in ($(OBJECTS)) 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) @@ -32,7 +32,7 @@ clean: .SYMBOLIC -erase *.err -erase *.pch -erase *.lib - -erase *.lnk + -erase $(LNK) -erase *.res -erase *.exe -erase *.lbc