don't report setlocale failure if trying to set Unicode-only language

[wxWidgets.git] / src / makelib.wat

diff --git a/src/makelib.wat b/src/makelib.wat
index ec5f1a0979fe2bb6fe5c0f2b2e6a971a0f4fc510..3390cb6ff2ac1f150924adf18bd6b9e77f83313a 100644 (file)
--- a/src/makelib.wat
+++ b/src/makelib.wat
@@ -1,24 +1,57 @@
-!include makewat.env
+#
+# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
+#
 
-# the name of the file containing the objects to be put in the library
-LNK = tmp.lbc
+<<<<<<< makelib.wat
+THISDIR = $+ $(%cdrive):$(%cwd) $-
+# set OUTPUTDIR to the directory to be used for the .obj files created during
+# the build (under $THISDIR)
+!ifndef OUTPUTDIR
+OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
+# no trailing slash for win98
+!endif
+
+=======
+OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $-
+
+>>>>>>> 1.1.8.2
+!include $(WXDIR)\src\makewat.env
+<<<<<<< makelib.wat
+
+all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
+=======
 
-all: $(LIBTARGET)
+>>>>>>> 1.1.8.2
 
+<<<<<<< makelib.wat
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@
+=======
+all: MAKDIR $(LIBTARGET) .SYMBOLIC
+>>>>>>> 1.1.8.2
+
+<<<<<<< makelib.wat
+=======
+MAKDIR:  .SYMBOLIC
+       @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
+
+>>>>>>> 1.1.8.2
+# the name of the file containing the objects to be put in the library
+LBCFILE=$(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)