diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-23 16:42:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-23 17:33:49 +0300 |
| commit | 8794ec9ad86d9c3fc64c7f8caf0ce9c07a623b02 (patch) | |
| tree | 61d10127620c77c63643aa4d6e289939ca147dcd /solenv | |
| parent | 6c28e9e1433f9d7e3f7efe31627198bfc0191ee1 (diff) | |
Use correct ICU library names when using MinGW cross-compiled "system" ones
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 3ec4bdcb2f02..74f4d3408b46 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -46,17 +46,17 @@ AWTLIB*=$(JAVA_HOME)/lib/jawt.lib AWTLIB*=-ljawt .ENDIF # "$(GUI)$(COM)"=="WNTGCC" AVMEDIALIB=-lavmedia$(DLLPOSTFIX) -.IF "$(GUI)$(COM)"=="WNTGCC" +.IF "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES" ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR) ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR) ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR) ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR) -.ELSE # "$(GUI)$(COM)"=="WNTGCC" +.ELSE # "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES" ICUINLIB=-licui18n ICULELIB=-licule ICUUCLIB=-licuuc ICUDATALIB=-licudata -.ENDIF # "$(GUI)$(COM)"=="WNTGCC" +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES" I18NUTILLIB=-li18nutil$(COMID) I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) |