Committing in .

[wxWidgets.git] / src / makeprog.wat

diff --git a/src/makeprog.wat b/src/makeprog.wat
index c36dce6abfc20298938823ff1d5a88857d997504..99b984842e7532306d9b14ed152021f8ae4ac471 100644 (file)
--- a/src/makeprog.wat
+++ b/src/makeprog.wat
@@ -5,7 +5,7 @@ WXDIR = $(%WXWIN)
 WXLIB = $(WXDIR)\lib
 LNK = $(PROGRAM).lnk
 
 WXLIB = $(WXDIR)\lib
 LNK = $(PROGRAM).lnk
 

-all: $(PROGRAM).exe
+all: $(PROGRAM).exe $(EXTRATARGETS)

 
 $(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib
     wlink @$(LNK)
 
 $(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) 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 ($(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)
 
 #    @%append $(LNK) $(MINDATA)
 #    @%append $(LNK) $(MAXDATA)
 


@@ -32,7 +32,7 @@ clean:   .SYMBOLIC
     -erase *.err
     -erase *.pch
     -erase *.lib
     -erase *.err
     -erase *.pch
     -erase *.lib

-    -erase *.lnk
+    -erase $(LNK)

     -erase *.res
     -erase *.exe
     -erase *.lbc
     -erase *.res
     -erase *.exe
     -erase *.lbc