From 1d7534fb95a8fb77d6b0f3fe0816094b36bde850 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 4 Dec 2010 17:59:36 -0500 Subject: [PATCH] Windows: build a UNICODE version of talocale.lib Add src/WINNT/talocale_unicode that builds a UNICODE version of talocale, talocaleU.lib Change-Id: Iec343adbbab23fefa2dd9f474d23e593810552e9 Reviewed-on: http://gerrit.openafs.org/3440 Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- NTMakefile | 9 +++++++- src/WINNT/talocale_unicode/NTMakefile | 43 +++++++++++++++++++++++++++++++++++ src/config/NTMakefile | 3 +++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/WINNT/talocale_unicode/NTMakefile diff --git a/NTMakefile b/NTMakefile index 618b3bb..88102c4 100644 --- a/NTMakefile +++ b/NTMakefile @@ -487,7 +487,14 @@ talocale: tbutc $(NTMAKE) $(CD) ..\..\.. -license: talocale +talocale_unicode: talocale + @echo ***** $@ + $(DOCD) $(SRC)\WINNT\$@ + $(CD) $(SRC)\WINNT\$@ + $(NTMAKE) + $(CD) ..\..\.. + +license: talocale_unicode @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ diff --git a/src/WINNT/talocale_unicode/NTMakefile b/src/WINNT/talocale_unicode/NTMakefile new file mode 100644 index 0000000..4c4e8c2 --- /dev/null +++ b/src/WINNT/talocale_unicode/NTMakefile @@ -0,0 +1,43 @@ +# Copyright 2000, International Business Machines Corporation and others. +# All Rights Reserved. +# +# This software has been released under the terms of the IBM Public +# License. For details, see the LICENSE file in the top-level source +# directory or online at http://www.openafs.org/dl/license10.html + +# make compiler warnings fatal + +AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -WX -DUNICODE=1 + +# include the primary makefile +RELDIR=WINNT\talocale_unicode +!INCLUDE ..\..\config\NTMakefile.$(SYS_NAME) + +############################################################################ + +INCFILEDIR = $(DESTDIR)\include\WINNT + +LIBOBJS = \ + $(OUT)\tal_alloc.obj \ + $(OUT)\tal_main.obj \ + $(OUT)\tal_string.obj \ + $(OUT)\tal_dialog.obj + +$(LIBOBJS): ..\talocale\$$(@B).cpp + $(CPP2OBJ) -I(..\talocale) $** + +LIBFILE = $(DESTDIR)\lib\afs\talocaleU.lib + +############################################################################ + +install: $(LIBFILE) + +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) + + +clean:: + $(DEL) $(LIBINCLUDES) + +mkdir: + diff --git a/src/config/NTMakefile b/src/config/NTMakefile index 58e2b1a..e9ce7ef 100644 --- a/src/config/NTMakefile +++ b/src/config/NTMakefile @@ -406,6 +406,9 @@ idirs: doclink ! IF (!EXIST($(OJT)\WINNT\talocale)) $(MKDIR) $(OJT)\WINNT\talocale ! ENDIF +! IF (!EXIST($(OJT)\WINNT\talocale_unicode)) + $(MKDIR) $(OJT)\WINNT\talocale_unicode +! ENDIF ! IF (!EXIST($(OJT)\WINNT\win9xpanel)) $(MKDIR) $(OJT)\WINNT\win9xpanel ! ENDIF -- 1.9.4