1. Added m_count and maintain its value in InsertItem, RemoveItem

[wxWidgets.git] / src / makelib.wat

diff --git a/src/makelib.wat b/src/makelib.wat
index 74cc16dc7bb7e312b24a96f9455e602292c33d05..52cd95aa5b53fee3cd651cbf1806007c726101b2 100644 (file)
--- a/src/makelib.wat
+++ b/src/makelib.wat
@@ -1,26 +1,26 @@
-WXDIR = $(%WXWIN)
+!include makewat.env
 
-!include $(WXDIR)\src\makewat.env
+all: $(OUTPUTDIR) $(LIBTARGET)
 
-WXLIB = $(WXDIR)\lib
-LNK = tmp.lbc
-
-all: $(LIBTARGET)
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@
 
+# the name of the file containing the objects to be put in the library
+LBCFILE=$(OUTPUTDIR)$(LIBTARGET).lbc
 $(LIBTARGET) : $(OBJECTS)
-    %create tmp.lbc
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+    %create $(LBCFILE)
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+    $(LIB) /b /c /n /p=512 $^@ @$(LBCFILE)
 
 clean:   .SYMBOLIC
-    -erase *.obj
-    -erase *.bak
-    -erase *.err
-    -erase *.pch
-    -erase *.lib
-    -erase *.lbc
-    -erase *.res
-    -erase *.exe
-    -erase *.lbc
+    -erase $(OUTPUTDIR)*.obj
+    -erase $(OUTPUTDIR)*.bak
+    -erase $(OUTPUTDIR)*.err
+    -erase $(OUTPUTDIR)*.pch
+    -erase $(OUTPUTDIR)*.lib
+    -erase $(OUTPUTDIR)*.lbc
+    -erase $(OUTPUTDIR)*.res
+    -erase $(OUTPUTDIR)*.exe
+    -erase $(OUTPUTDIR)*.lbc
     -erase $(LIBTARGET)