use correctly defined LIBPAGESIZE instead of 512 for the page size

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makelib.wat b/src/makelib.wat
index ec5f1a0979fe2bb6fe5c0f2b2e6a971a0f4fc510..52cd95aa5b53fee3cd651cbf1806007c726101b2 100644 (file)
--- a/src/makelib.wat
+++ b/src/makelib.wat
@@ -1,24 +1,26 @@
 !include makewat.env
 
-# the name of the file containing the objects to be put in the library
-LNK = tmp.lbc
+all: $(OUTPUTDIR) $(LIBTARGET)
 
-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 $(LNK)
-    @for %i in ( $(OBJECTS) ) do @%append $(LNK) +%i
-    wlib /b /c /n /p=512 $^@ @$(LNK)
+    %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)
 

diff --git a/src/makewat.env b/src/makewat.env
index 9ff838e3c292cb07dae12e8b733bc579949c43f5..9672a1a6777b1ac95ee4f05a1ef4df0ee9a1e6e0 100644 (file)
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -76,10 +76,16 @@ BASEDIRPREFIX =
 
 ARCHINCDIR=$(WXDIR)\lib\$(TOOLKIT)$(DEBUGSUFFIX)
 
+# set the things which depend on debug/release
+#
+# note that the values for LIBPAGESIZE are minimal possible, the library
+# doesn't link (Error! Library too large) with values smaller than given
 !ifeq FINAL 1
 CONFIGURATION=Release
+LIBPAGESIZE=/p=1024
 !else
 CONFIGURATION=Debug
+LIBPAGESIZE=/p=2048
 !endif
 
 # set OUTPUTDIR to the directory to be used for the .obj files created during
@@ -102,6 +108,7 @@ LIBNAME=wx$(TOOLKIT)$(DEBUGSUFFIX)$(WATCOM_SUFFIX)
 LEVEL       = 386
 CXX         = wpp$(LEVEL)
 CC          = wcc$(LEVEL)
+LIB         = wlib /q
 RC          = wrc
 WINVERFLAGS = /dWINVER=0x400
 BINDCOMMAND = wrc

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 502c299d2c12b3e876afb6e304b46beeaf76ce1e..74898a49c8823f454daf6768e8e940ec7bc1a458 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -362,11 +362,11 @@ $(OUTPUTDIR):
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
        copy $(WXDIR)\include\wx\msw\setup.h $@
 
-LBCFILE=wx$(TOOLKIT).lbc
+LBCFILE=$(OUTPUTDIR)wx$(TOOLKIT).lbc
 $(LIBTARGET) : $(OBJECTS)
     %create $(LBCFILE)
     @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /b /c /n /p=512 $^@ @$(LBCFILE)
+    $(LIB) /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)