diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
| commit | 024e577dc34f1a978dadf4ad82b8ea45fd81de07 (patch) | |
| tree | 6d051c13bb6312adfb3766ad5d3c75a2abea157b /solenv | |
| parent | 52bae175c7fc9b95cbb16960335310a0be1e42f6 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/libs.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/wntgcci6.mk | 6 |
2 files changed, 5 insertions, 3 deletions
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" |