From 024e577dc34f1a978dadf4ad82b8ea45fd81de07 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 20 Jan 2009 16:36:21 +0000 Subject: CWS-TOOLING: integrate CWS mingwport16 2009-01-15 13:11:20 +0100 releng r266363 : tidy-up tabs 2008-11-28 15:33:23 +0100 tono r264557 : i95203: mingw build without stlport 2008-11-22 07:19:50 +0100 tono r264180 : i96436: make mingw bridge conform with reg-struct-return 2008-11-22 05:14:58 +0100 tono r264179 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 17:09:04 +0100 tono r264153 : i95203: mingw build without stlport 2008-11-21 16:59:55 +0100 tono r264152 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:59:18 +0100 tono r264151 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:57:01 +0100 tono r264150 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:53:19 +0100 tono r264149 : i96100: mingw port for icu 4.0 2008-11-13 13:41:13 +0100 tono r263643 : i95203: mingw: Build without stlport 2008-11-13 13:29:38 +0100 tono r263640 : i96100: MinGW port for icu 4.0 2008-11-13 13:17:10 +0100 tono r263634 : i96098: MinGW port fix for new Windows API 2008-11-09 15:22:59 +0100 tono r263497 : i95198: mingwport do not interfere with Cygwin 2008-11-09 14:44:54 +0100 tono r263496 : i95190: mingwport avoid use of MS assembler 2008-11-09 14:32:26 +0100 tono r263495 : i95190: mingwport trivial build fixes --- config_office/configure | 4 +++- config_office/configure.in | 4 +++- config_office/set_soenv.in | 4 ++-- scp2/source/winexplorerext/makefile.mk | 4 ++++ solenv/inc/libs.mk | 2 +- solenv/inc/wntgcci6.mk | 6 ++++-- soltools/mkdepend/collectdircontent.cxx | 4 ++-- stlport/systemstl/functional | 7 ++++++- stlport/systemstl/numeric | 7 ++++++- stlport/systemstl/vector | 7 ++++++- 10 files changed, 37 insertions(+), 12 deletions(-) diff --git a/config_office/configure b/config_office/configure index 3ea9e0a7b83a..35f37e768f99 100755 --- a/config_office/configure +++ b/config_office/configure @@ -9493,6 +9493,8 @@ echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6 esac elif test "$_os" = "Darwin"; then DEFAULT_TO_STLPORT="no" + elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" = "yes"; then + DEFAULT_TO_STLPORT="no" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then echo "$as_me:$LINENO: result: stlport" >&5 @@ -23004,7 +23006,7 @@ if test -z "$CYGWIN_PATH"; then fi -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6 if test -n "$with_asm_home"; then diff --git a/config_office/configure.in b/config_office/configure.in index 49318a093dcc..2f67a5357e94 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -2304,6 +2304,8 @@ dnl =================================================================== esac elif test "$_os" = "Darwin"; then DEFAULT_TO_STLPORT="no" + elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" = "yes"; then + DEFAULT_TO_STLPORT="no" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then AC_MSG_RESULT([stlport]) @@ -4937,7 +4939,7 @@ AC_SUBST(CYGWIN_PATH) dnl *************************************** dnl testing ml.exe assembler path dnl *************************************** -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then AC_MSG_CHECKING([ml.exe assembler path]) if test -n "$with_asm_home"; then with_asm_home=`cygpath -u "$with_asm_home"` diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index fdbce7aaed2d..ec83aec2c7c1 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1166,8 +1166,7 @@ if ($platform =~ m/cygwin|os2/) $wps.$JAVA_HOME.$LIB; if ( $USE_MINGW eq "cygwin" ) { $ILIB .= $wps.PathFormat($USR.$LIB.$ds."mingw"). - $wps.PathFormat($USR.$LIB.$ds."w32api"). - $wps.PathFormat($USR.$LIB); + $wps.PathFormat($USR.$LIB.$ds."w32api"); } else { $ILIB .= $wps.$COMPATH.$LIB; @@ -1544,6 +1543,7 @@ elsif ($platform =~ m/cygwin/) { $SOLARINC .= $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".$ds."mingw".$ds."include"; if ( $USE_MINGW eq "cygwin" ) { $SOLARINC .= $I.PathFormat($USR.$ds."include".$ds."mingw".$ds."include"). + $I.PathFormat($USR.$ds."include".$ds."mingw"). $I.PathFormat($USR.$ds."include".$ds."w32api"). $I.PathFormat($USR.$ds."include"); } else diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk index 264368ad28e0..ce5ae0935ba6 100644 --- a/scp2/source/winexplorerext/makefile.mk +++ b/scp2/source/winexplorerext/makefile.mk @@ -50,6 +50,10 @@ PARFILES= \ registryitem_winexplorerext.par .ENDIF +.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4" +SCPDEFS+=-DUSE_SYSTEM_STL +.ENDIF + ULFFILES= \ module_winexplorerext.ulf diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 798f0c1304f1..02b8b7ebf73f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -46,7 +46,7 @@ AVMEDIALIB=-lavmedia$(DLLPOSTFIX) ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR) ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR) ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR) -ICUDATALIB=-licudata$(ICU_MAJOR)$(ICU_MINOR) +ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" ICUINLIB=-licui18n ICULELIB=-licule diff --git a/solenv/inc/wntgcci6.mk b/solenv/inc/wntgcci6.mk index 1bff6c8bc855..a57fd284600e 100644 --- a/solenv/inc/wntgcci6.mk +++ b/solenv/inc/wntgcci6.mk @@ -50,7 +50,7 @@ CXX*=gcc #CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF) # new: #CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /) -CFLAGS=-fmessage-length=0 -c -nostdinc -fpcc-struct-return $(OLE2DEF) +CFLAGS=-fmessage-length=0 -c -nostdinc $(OLE2DEF) ### CFLAGSCC=-pipe $(ARCH_FLAGS) CFLAGSCXX=-pipe $(ARCH_FLAGS) @@ -107,7 +107,9 @@ MODULES_WITH_WARNINGS := \ STATIC= -static DYNAMIC= -dynamic -LINK*=$(CC) +LINK*=$(CXX) +LINKC*=$(CC) + CYGLIB=$(LIB:s/;/ -L/) LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB) .IF "$(USE_MINGW)"=="cygwin" diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 50da374841cd..95cd3da8d857 100755 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -26,7 +26,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { }; do { string winFileName(FindFileData.cFileName); - transform(winFileName.begin(), winFileName.end(), winFileName.begin(), tolower); + transform(winFileName.begin(), winFileName.end(), winFileName.begin(), ::tolower); dirContent.insert(winFileName); } while (FindNextFile(hFind, &FindFileData)); #else @@ -47,7 +47,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { bool IncludesCollection::exists(string filePath) { #if defined( WNT ) - transform(filePath.begin(), filePath.end(), filePath.begin(), tolower); + transform(filePath.begin(), filePath.end(), filePath.begin(), ::tolower); #endif // defined( WNT ) PathFilePair dirFile = split_path(filePath); string dirPath = dirFile.first; diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index 063e79d307e9..6fb7e66330f6 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -32,7 +32,12 @@ #define SYSTEM_STL_FUNCTIONAL #ifdef GCC -#include +#ifdef __MINGW32__ +# define _SYSTEM_STL_MAKE_HEADER(path,header) +# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional) +#else +# include +#endif #include namespace std diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric index 8095edc90718..d18328bc5363 100644 --- a/stlport/systemstl/numeric +++ b/stlport/systemstl/numeric @@ -33,7 +33,12 @@ #ifdef GCC #include -#include +#ifdef __MINGW32__ +# define _SYSTEM_STL_MAKE_HEADER(path,header) +# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric) +#else +# include +#endif #include namespace std diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector index 035160fcfa3d..1b9ab9eef418 100644 --- a/stlport/systemstl/vector +++ b/stlport/systemstl/vector @@ -33,7 +33,12 @@ #ifdef GCC -#include +#ifdef __MINGW32__ +# define _SYSTEM_STL_MAKE_HEADER(path,header) +# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,vector) +#else +# include +#endif namespace std { -- cgit v1.2.3