AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3253 Make it easier for the CygWin/MSVC configuration to work

Browse Source 
X-SVN-Rev: 13089
This commit is contained in:
George Rhoten 2003-09-13 08:46:41 +00:00
parent 36251276a3
commit 61a1109990
2 changed files with 130 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
icu4c/source/config/mh-cygwin-msvc
View File

@ -3,7 +3,7 @@
## Copyright (c) 2001-2003, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-cygwin-msvc,v 1.10 2003/08/08 23:53:43 grhoten-oss Exp $
## $Id: mh-cygwin-msvc,v 1.11 2003/09/13 08:46:41 grhoten-oss Exp $
## Commands to generate dependency files
GEN_DEPS.c= :
@ -16,15 +16,24 @@ SHAREDLIBCPPFLAGS =
## Additional flags when building libraries and with threads
LIBCPPFLAGS =
THREADSCPPFLAGS =
# /MDd means 'compiles and links a debugable multithreaded program with DLL'
#THREADSCFLAGS += /MDd
#THREADSCXXFLAGS += /MDd
# /MD means 'compiles and links a multithreaded program with DLL'
THREADSCFLAGS += /MD
THREADSCXXFLAGS += /MD
# /GF pools strings and places them into read-only memory
# TODO: Fix /MD so that multithreading is disabled when requested
CFLAGS += /MD /GF
CXXFLAGS += /MD /GF
CPPFLAGS+=/nologo
DEFS+=/D"WIN32"
DEFS+=/D"WIN32" /D"U_CYGWIN"
LDFLAGS+=/nologo
# Commands to compile
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /GF /c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /GF /c
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /c
# Commands to link
LINK.c= LINK.EXE /subsystem:console $(LDFLAGS)
@ -52,7 +61,7 @@ OUTOPT = /out:
IMPORT_LIB_EXT = .lib
LIBICU = $(ICUPREFIX)
DEFAULT_LIBS =
DEFAULT_LIBS = advapi32.lib
## Link commands to link to ICU libs
LIBICUDT= $(top_builddir)/stubdata/$(LIBICU)data$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib

5
icu4c/source/tools/makeconv/makeconv.c
View File

@ -392,11 +392,16 @@ int main(int argc, char* argv[])
/* find the last file sepator */
basename = uprv_strrchr(arg, U_FILE_SEP_CHAR);
if (basename == NULL) {
basename = uprv_strrchr(arg, U_FILE_ALT_SEP_CHAR);
if (basename == NULL) {
basename = arg;
} else {
++basename;
}
} else {
++basename;
}
uprv_strcpy(outBasename, basename);
}