X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..f59164e3d128c7675a4d3934206346a3384e53a5:/icuSources/extra/uconv/makedata.mak

diff --git a/icuSources/extra/uconv/makedata.mak b/icuSources/extra/uconv/makedata.mak
index 2ba70c84..09bd13e1 100644
--- a/icuSources/extra/uconv/makedata.mak
+++ b/icuSources/extra/uconv/makedata.mak
@@ -1,5 +1,5 @@
 #**********************************************************************
-#* Copyright (C) 1999-2004, International Business Machines Corporation
+#* Copyright (C) 1999-2008, International Business Machines Corporation
 #* and others.  All Rights Reserved.
 #**********************************************************************
 # nmake file for creating data files on win32
@@ -15,7 +15,7 @@ CFG=Debug
 !ENDIF
 
 #Here we test if a valid configuration is given
-!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug"
+!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug" && "$(CFG)" != "x86\Release" && "$(CFG)" != "x86\Debug" && "$(CFG)" != "x64\Release" && "$(CFG)" != "x64\Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
@@ -45,12 +45,16 @@ DLL_OUTPUT=.\$(CFG)
 # set the following to 'static' or 'dll' depending
 PKGMODE=static
 
-
 ICD=$(ICUDATA)^\
 DATA_PATH=$(ICUP)\data^\
-ICUTOOLS=$(ICUP)\bin
 
+!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug"
+ICUTOOLS=$(ICUP)\bin64
+PATH = $(ICUP)\bin64;$(PATH)
+!ELSE
+ICUTOOLS=$(ICUP)\bin
 PATH = $(ICUP)\bin;$(PATH)
+!ENDIF
 
 # Suffixes for data files
 .SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
@@ -63,8 +67,8 @@ FILESEPCHAR=
 !ELSE
 !ERROR ERROR: cannot find "$(RESFILES)"
 !ENDIF
-RB_FILES = $(RESSRC:.txt=.res)
-RB_FILES = resources\$(RB_FILES:.res =.res resources\)
+RES_FILES = $(RESSRC:.txt=.res)
+RB_FILES = resources\$(RES_FILES:.res =.res resources\)
 RESOURCESDIR=
 
 # This target should build all the data files
@@ -82,7 +86,7 @@ ALL : $(OUTPUT)
 "$(DLL_OUTPUT)\$(RESNAME).lib" : $(RB_FILES) $(RESFILES)
 	@echo Building $(RESNAME).lib
 	@"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
-$(RESSRC:.txt =.res
+$(RES_FILES:.res =.res
 )
 <<KEEP