ICU-8.11.1.tar.gz

[apple/icu.git] / icuSources / tools / pkgdata / winmode.c

diff --git a/icuSources/tools/pkgdata/winmode.c b/icuSources/tools/pkgdata/winmode.c
index 11e922cabd2bdaaa0e287b3799f35e8ba6cee7f0..d5b598746ea71749898dfcdc1edfdc05e2aed0af 100644 (file)
--- a/icuSources/tools/pkgdata/winmode.c
+++ b/icuSources/tools/pkgdata/winmode.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 *
-*   Copyright (C) 2000-2004, International Business Machines
+*   Copyright (C) 2000-2006, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -40,19 +40,13 @@ void writeCmnRules(UPKGOptions *o,  FileStream *makefile)
     char tmp[1024];
     CharList *infiles;
 
-    if(!o->embed) {
-      infiles = o->files; 
-    } else {
-      infiles = o->filePaths;
-    }
+    infiles = o->files; 
     sprintf(tmp, "\"$(TARGETDIR)\\$(CMNTARGET)\" : $(DATAFILEPATHS)\n"
-        "\t%s\"$(GENCMN)\" %s%s%s-d \"$(TARGETDIR)\" %s %s -n \"$(NAME)\" 0 <<\n",
+        "\t%s\"$(GENCMN)\" %s%s%s-d \"$(TARGETDIR)\" -s \"$(SRCDIR)\" -n \"$(NAME)\" 0 <<\n",
         (o->verbose ? "" : "@"),
         (o->comment ? "-C \"" : ""),
         (o->comment ? o->comment : ""),
-        (o->comment ? "\" " : ""),
-        (o->embed ? "-E" : ""),
-         o->embed ? "" : "-s \"$(SRCDIR)\"");
+        (o->comment ? "\" " : ""));
     T_FileStream_writeLine(makefile, tmp);
 
     pkg_writeCharList(makefile, infiles, "\n", -1);
@@ -118,7 +112,7 @@ void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
 
         sprintf(tmp2,
             "LINK32 = link.exe\n"
-            "LINK32_FLAGS = /nologo /out:\"$(TARGETDIR)\\$(DLLTARGET)\" /DLL /NOENTRY /base:\"0x4ad00000\" /implib:\"$(TARGETDIR)\\$(LIBNAME).lib\" %s%s%s\n",
+            "LINK32_FLAGS = /nologo /out:\"$(TARGETDIR)\\$(DLLTARGET)\" /DLL /NOENTRY $(LDFLAGS) $(PKGDATA_LDFLAGS) /implib:\"$(TARGETDIR)\\$(LIBNAME).lib\" %s%s%s\n",
             (o->comment ? "/comment:\"" : ""),
             (o->comment ? o->comment : ""),
             (o->comment ? "\"" : ""),