Merged some STC fixes over to the main branch

[wxWidgets.git] / src / makeprog.wat

diff --git a/src/makeprog.wat b/src/makeprog.wat
index c36dce6abfc20298938823ff1d5a88857d997504..431ecc5d3fc9330dc617165e9a328c5537e98a35 100644 (file)
--- 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,7 +20,7 @@ $(LNK) : makefile.wat
     @%append $(LNK) system $(LINKOPTION)
     @%append $(LNK) $(STACK)
     @%append $(LNK) name $(PROGRAM).exe
-    @%append $(LNK) file $(WXLIB)\wx.lib
+    @for %i in ($(LIBS)) do @%append $(LNK) file %i
     @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
     @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
 #    @%append $(LNK) $(MINDATA)
@@ -32,7 +32,7 @@ clean:   .SYMBOLIC
     -erase *.err
     -erase *.pch
     -erase *.lib
-    -erase *.lnk
+    -erase $(LNK)
     -erase *.res
     -erase *.exe
     -erase *.lbc