ICU-6697 Changes for x64.

X-SVN-Rev: 25302
This commit is contained in:
Eric Mader 2009-01-23 05:12:23 +00:00
parent 9b8a829f2a
commit 2a3b48cf1b
12 changed files with 53 additions and 38 deletions

View file

@ -168,7 +168,7 @@
OutputFile=".\x64\Release/cal.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
ProgramDatabaseFile=".\x64\Release/cal.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@ -351,7 +351,7 @@
OutputFile=".\x64\Debug/cal.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/cal.pdb"
SubSystem="1"

View file

@ -151,7 +151,7 @@
AdditionalDependencies="icuucd.lib icuind.lib"
OutputFile="$(OutDir)/csdet.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/csdet.pdb"
SubSystem="1"
@ -309,7 +309,7 @@
AdditionalDependencies="icuuc.lib icuin.lib"
OutputFile="$(OutDir)/csdet.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View file

@ -168,7 +168,7 @@
OutputFile=".\x64\Release/date.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
ProgramDatabaseFile=".\x64\Release/date.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@ -349,7 +349,7 @@
OutputFile=".\x64\Debug/date.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/date.pdb"
SubSystem="1"

View file

@ -169,7 +169,7 @@
OutputFile=".\x64\Debug/numfmt.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/numfmt.pdb"
SubSystem="1"
@ -350,7 +350,7 @@
OutputFile=".\x64\Release/numfmt.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
ProgramDatabaseFile=".\x64\Release/numfmt.pdb"
SubSystem="1"
RandomizedBaseAddress="1"

View file

@ -166,10 +166,10 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="icuucd.lib"
OutputFile=".\reader_Win32_Debug/reader.exe"
OutputFile=".\reader_x64_Debug/reader.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\reader_Win32_Debug/reader.pdb"
SubSystem="1"
@ -347,10 +347,10 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="icuuc.lib"
OutputFile=".\reader_Win32_Release/reader.exe"
OutputFile=".\reader_x64_Release/reader.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
ProgramDatabaseFile=".\reader_Win32_Release/reader.pdb"
SubSystem="1"
RandomizedBaseAddress="1"

View file

@ -169,7 +169,7 @@
OutputFile=".\x64\Debug/writer.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/writer.pdb"
SubSystem="1"
@ -350,7 +350,7 @@
OutputFile=".\x64\Release/writer.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
ProgramDatabaseFile=".\x64\Release/writer.pdb"
SubSystem="1"
RandomizedBaseAddress="1"

View file

@ -1,4 +1,4 @@
# Copyright (c) 2001-2006 IBM, Inc. and others
# Copyright (c) 2001-2009 IBM, Inc. and others
#
# fortune_resources.mak
#
@ -21,6 +21,15 @@ RESFILES= root.res es.res
#
ICUDIR=..\..\..\..
#
# The directory that contains the tools.
#
!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug"
BIN=bin64
!ELSE
BIN=bin
!ENDIF
#
# File name extensions for inference rule matching.
# clear out the built-in ones (for .c and the like), and add
@ -33,7 +42,7 @@ ICUDIR=..\..\..\..
# -t fools make into thinking there are files such as es.res, etc
#
.txt.res:
$(ICUDIR)\bin\genrb -d . $*.txt
$(ICUDIR)\$(BIN)\genrb -d . $*.txt
#
# all - nmake starts here by default
@ -41,5 +50,5 @@ ICUDIR=..\..\..\..
all: fortune_resources.dll
fortune_resources.dll: $(RESFILES)
$(ICUDIR)\bin\pkgdata --name fortune_resources -v --mode dll -d . res-file-list.txt
$(ICUDIR)\$(BIN)\pkgdata --name fortune_resources -v --mode dll -d . res-file-list.txt

View file

@ -421,7 +421,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak CFG=x86\Debug&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
Outputs="resources\fortune_resources.DLL"
/>
</FileConfiguration>
@ -430,7 +430,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak CFG=x64\Debug&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
Outputs="resources\fortune_resources.DLL"
/>
</FileConfiguration>
@ -439,7 +439,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak CFG=x86\Release&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
Outputs="resources\fortune_resources.DLL"
/>
</FileConfiguration>
@ -448,7 +448,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
CommandLine="cd resources&#x0D;&#x0A;nmake -f fortune_resources.mak CFG=x64\Release&#x0D;&#x0A;copy Fortune_Resources.DLL &quot;$(TargetDir)&quot;&#x0D;&#x0A;"
Outputs="resources\fortune_resources.DLL"
/>
</FileConfiguration>

View file

@ -175,7 +175,7 @@
OutputFile=".\x64\Release/ugrep.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
ProgramDatabaseFile=".\x64\Release/ugrep.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@ -357,7 +357,7 @@
AdditionalDependencies="icuucd.lib icuind.lib"
OutputFile=".\x64\Debug/ugrep.exe"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib"
AdditionalLibraryDirectories="../../../lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/ugrep.pdb"
SubSystem="1"

View file

@ -1,8 +1,14 @@
## Copyright (c) 2001-2005 International Business Machines
## Copyright (c) 2001-2009 International Business Machines
## Corporation and others. All Rights Reserved.
PACKAGE_NAME = uresb
TARGETS = en.res root.res sr.res
!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug"
GENRB = ..\..\..\bin64\genrb.exe
!ELSE
GENRB = ..\..\..\bin\genrb.exe
!ENDIF
GENRBOPT = -s . -d .
all : $(TARGETS)

View file

@ -27,9 +27,9 @@
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="nmake /f &quot;resources.mak&quot;"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean"
BuildCommandLine="nmake /f &quot;resources.mak&quot; CFG=x86\Debug"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a CFG=x86\Debug"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean CFG=x86\Debug"
Output="uresb_root.res"
PreprocessorDefinitions=""
IncludeSearchPath=""
@ -48,9 +48,9 @@
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="nmake /f &quot;resources.mak&quot;"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean"
BuildCommandLine="nmake /f &quot;resources.mak&quot; CFG=x64\Debug"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a CFG=x64\Debug"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean CFG=x64\Debug"
Output="uresb_root.res"
PreprocessorDefinitions=""
IncludeSearchPath=""
@ -69,9 +69,9 @@
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="nmake /f &quot;resources.mak&quot;"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean"
BuildCommandLine="nmake /f &quot;resources.mak&quot; CFG=x86\Release"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a CFG=x86\Release"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean CFG=x86\Release"
Output="uresb_root.res"
PreprocessorDefinitions=""
IncludeSearchPath=""
@ -90,9 +90,9 @@
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="nmake /f &quot;resources.mak&quot;"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean"
BuildCommandLine="nmake /f &quot;resources.mak&quot; CFG=x64\Release"
ReBuildCommandLine="nmake /f &quot;resources.mak&quot; /a CFG=x64\Release"
CleanCommandLine="nmake /f &quot;resources.mak&quot; clean CFG=x64\Release"
Output="uresb_root.res"
PreprocessorDefinitions=""
IncludeSearchPath=""

View file

@ -168,7 +168,7 @@
OutputFile=".\x64\Release/uresb.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib/,../../tools/toolutil/"
AdditionalLibraryDirectories="../../../lib64/,../../tools/toolutil/"
ProgramDatabaseFile=".\x64\Release/uresb.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@ -349,7 +349,7 @@
OutputFile=".\x64\Debug/uresb.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../lib/,../../tools/toolutil/"
AdditionalLibraryDirectories="../../../lib64/,../../tools/toolutil/"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/uresb.pdb"
SubSystem="1"