organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 17:01:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-1220 Fix the Windows build of uconv

Browse source 
X-SVN-Rev: 7278
This commit is contained in:
George Rhoten 2001-12-03 20:27:42 +00:00
parent cc4e72b886
commit a026a70834
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
icu4c/source/extra/uconv/makedata.mak
View file

@ -41,12 +41,11 @@ RESDIR=. #$(ICUP)\..\icuapps\uconv\$(RESNAME)
RESFILES=resfiles.mk
ICUDATA=$(ICUP)\data
DLL_OUTPUT=$(ICUP)\source\data
DLL_OUTPUT=.\$(CFG)
ICD=$(ICUDATA)^\
DATA_PATH=$(ICUP)\data^\
TEST=..\source\test\testdata^\
ICUTOOLS=$(ICUP)\source\tools
ICUTOOLS=$(ICUP)\bin
# We have to prepare params for pkgdata - to help it find the tools
!IF "$(CFG)" == "Debug" || "$(CFG)" == "debug"
@ -83,10 +82,12 @@ ALL : GODATA "$(DLL_OUTPUT)\$(RESNAME).dll" GOBACK #$(RESNAME).dat
#invoke pkgdata
"$(DLL_OUTPUT)\$(RESNAME).dll" : $(RB_FILES) $(RESFILES)
@echo Building $(RESNAME)
@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -m dll -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
@"$(ICUTOOLS)\pkgdata" -v -m dll -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
$(RB_FILES:.res =.res
)
<<KEEP
@echo Copying "$(DLL_OUTPUT)\$(RESNAME).dll to $(ICUP)\bin
@copy "$(DLL_OUTPUT)\$(RESNAME).dll" $(ICUP)\bin
# utility to send us to the right dir
GODATA :
@ -101,27 +102,16 @@ CLEAN :
@cd "$(RESDIR)"
-@erase "*.cnv"
-@erase "*.res"
-@erase "$(TRANS)*.res"
-@erase "uprops*.*"
-@erase "unames*.*"
-@erase "cnvalias*.*"
-@erase "tz*.*"
-@erase "ibm*_cnv.c"
-@erase "*_brk.c"
-@erase "icudata.*"
-@erase "*.obj"
-@erase "test*.*"
-@erase "base*.*"
@cd $(TEST)
-@erase "*.res"
@cd "$(ICUTOOLS)"
# Inference rule for creating resource bundles
.txt.res:
@echo Making Resource Bundle files
"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s$(@D) -d$(@D) $(?F)
"$(ICUTOOLS)\genrb" -s$(@D) -d$(@D) $(?F)
$(RESSRC) : {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe
$(RESSRC) : {"$(ICUTOOLS)"}genrb.exe

27
icu4c/source/extra/uconv/uconv.dsp
View file

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\icu\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\icu\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -56,8 +56,8 @@ InputPath=.\Release\uconv.exe
InputName=uconv
SOURCE="$(InputPath)"
"..\..\icu\bin\$(InputName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\..\icu\bin
"..\..\..\..\icu\bin\$(InputName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\..\..\..\icu\bin
# End Custom Build
@ -75,7 +75,7 @@ SOURCE="$(InputPath)"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\icu\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\icu\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -86,10 +86,11 @@ LINK32=link.exe
# ADD LINK32 icuuc.lib icuin.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\icu\lib"
# Begin Custom Build
InputPath=.\Debug\uconv.exe
InputName=uconv
SOURCE="$(InputPath)"
"..\..\icu\bin\$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\..\icu\bin
"..\..\..\..\icu\bin\$(InputName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\..\..\..\icu\bin
# End Custom Build
@ -136,6 +137,16 @@ SOURCE=.\makedata.mak
!IF "$(CFG)" == "uconv - Win32 Release"
# Begin Custom Build
ProjDir=.
InputPath=.\makedata.mak
InputName=makedata
"$(ProjDir)\..\..\..\..\icu\bin\uconvmsg.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nmake /nologo /f $(InputName).mak icup=$(ProjDir)\..\..\..\..\icu CFG=Release
# End Custom Build
!ELSEIF "$(CFG)" == "uconv - Win32 Debug"
# Begin Custom Build
@ -143,8 +154,8 @@ ProjDir=.
InputPath=.\makedata.mak
InputName=makedata
"$(ProjDir)\..\..\icu\data\uconvmsg.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nmake /f $(InputName).mak icup=$(ProjDir)\..\..\icu CFG=Debug
"$(ProjDir)\..\..\..\..\icu\bin\uconvmsg.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nmake /nologo /f $(InputName).mak icup=$(ProjDir)\..\..\..\..\icu CFG=Debug
# End Custom Build