ICU-59180.0.1.tar.gz

[apple/icu.git] / icuSources / extra / uconv / makedata.mak

diff --git a/icuSources/extra/uconv/makedata.mak b/icuSources/extra/uconv/makedata.mak
index 21d5bc377a087a88b64eaafdecab351b43febef0..52d7c4930680fa49f92d5016a35eb8df81e51014 100644 (file)
--- a/icuSources/extra/uconv/makedata.mak
+++ b/icuSources/extra/uconv/makedata.mak
@@ -1,5 +1,7 @@
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html
 #**********************************************************************
-#* Copyright (C) 1999-2006, 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 +17,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 +47,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