Found bug that skrewed up display wrt horizontal

[wxWidgets.git] / src / makeprog.wat

diff --git a/src/makeprog.wat b/src/makeprog.wat
index 7814ef4947ccee41b1586a7e04960feea6e09ef8..431ecc5d3fc9330dc617165e9a328c5537e98a35 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,7 +20,7 @@ $(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 ($(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)
     @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
     @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
 #    @%append $(LNK) $(MINDATA)