Windows: Build afs_shl_ext.dll with talocaleU.lib

[openafs.git] / src / WINNT / client_exp / NTMakefile

diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile
index 0ad2f6c..ba62a6a 100644 (file)
--- a/src/WINNT/client_exp/NTMakefile
+++ b/src/WINNT/client_exp/NTMakefile
@@ -5,17 +5,25 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I..\afsd  /D"_WINDOWS" /D"_WINDLL" /D"_AFXDLL" /D"_USRDLL"
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I$(DESTDIR)\include\afs -I$(DESTDIR)\include\rx \
+        /D"_WINDOWS" /D"_WINDLL" /D"_AFXDLL" /D"_USRDLL" -DUNICODE -D_UNICODE
 
 NO_CRTDBG=1                    #define this to disable any CRT_DBG flag
 RELDIR=WINNT\client_exp
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
 !include ..\..\config\NTMakefile.version
 
+ETC = $(DESTDIR)\root.client\usr\vice\etc
+
 ############################################################################
 # afs_shl_ext.dll
 
-DLLFILE = $(DESTDIR)\root.client\usr\vice\etc\afs_shl_ext.dll
+
+DLLFILE = $(ETC)\afs_shl_ext.dll
+
+ICONS =\
+        $(ETC)\link.ico \
+        $(ETC)\mount.ico
 
 DLLOBJS =\
        $(OUT)\add_acl_entry_dlg.obj \
@@ -50,7 +58,7 @@ DLLOBJS =\
 AFSD = ..\afsd
 
 $(OUT)\fs_utils.obj: $(AFSD)\fs_utils.c
-       $(C2OBJ) $**
+       $(C2OBJ) -I$(DESTDIR)\include\rx $**
 
 DLLSDKLIBS =\
     mpr.lib
@@ -60,13 +68,25 @@ DLLLIBS =\
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\libafsconf.lib \
        $(DESTDIR)\lib\libosi.lib \
-       $(DESTDIR)\lib\afs\TaLocale.lib \
+        $(DESTDIR)\lib\afs\afsreg.lib  \
+       $(DESTDIR)\lib\afs\TaLocaleU.lib \
        $(DESTDIR)\lib\afs\afsutil.lib
 
 $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:afs_shl_ext.def $(DLLSDKLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
+
+############################################################################
+# Install Icon files
+
+$(ETC)\mount.ico: mount.ico
+        $(COPY) $** $@
+
+$(ETC)\link.ico: link.ico
+        $(COPY) $** $@
 
 ############################################################################
 # Definitions for generating versioninfo resources
@@ -76,9 +96,7 @@ $(OUT)\afs_shl_ext_stub.res: AFS_component_version_number.h
 ############################################################################
 # Install target; primary makefile target
 
-install: $(DLLFILE) lang
-install9x: install
-
+install: $(DLLFILE) $(ICONS) lang
 
 ############################################################################
 # Language target