mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS mingwport22

Browse Source 
2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo
This commit is contained in:
Vladimir Glazounov 2009-08-26 06:36:38 +00:00
parent c6efe67643
commit 68e8dec50f
13 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
embedserv/source/inprocserv/makefile.mk
View File

@ -57,7 +57,17 @@ SLOFILES=\
$(SLO)$/inprocembobj.obj
SHL1TARGET=$(TARGET)
SHL1STDLIBS=\
.IF "$(COM)"=="GCC"
SHL1STDLIBS += -lstdc++
.IF "$(MINGW_GCCLIB_EH)"=="YES"
SHL1STDLIBS += -lgcc_eh
.ENDIF
SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
.ELSE
SHL1STDLIBS=
.ENDIF
SHL1STDLIBS+=\
$(UUIDLIB)\
$(OLE32LIB)\
$(GDI32LIB)\

2
extensions/source/activex/main/SOActiveX.h
View File

@ -163,7 +163,7 @@ public:
HRESULT GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl );
HRESULT Cleanup();
HRESULT TerminateOffice();
HRESULT CSOActiveX::GetURL( const OLECHAR* url,
HRESULT GetURL( const OLECHAR* url,
const OLECHAR* target );
void CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* pbsc, BYTE* pBytes, DWORD dwSize );

6
extensions/source/ole/oleobjw.hxx
View File

@ -32,8 +32,10 @@
#define __OLEOBJW_HXX
#include "ole2uno.hxx"
#ifdef _MSC_VER
#pragma warning (push,1)
#pragma warning (disable:4548)
#endif
#include <tools/presys.h>
#define _WIN32_WINNT 0x0400
@ -46,7 +48,9 @@
#include <hash_map>
#include <tools/postsys.h>
#ifdef _MSC_VER
#pragma warning (pop)
#endif
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
@ -88,7 +92,7 @@ public:
~IUnknownWrapper_Impl();
//XInterface
Any SAL_CALL IUnknownWrapper_Impl::queryInterface(const Type& t)
Any SAL_CALL queryInterface(const Type& t)
throw (RuntimeException);
// XInvokation

1
setup_native/source/win32/customactions/indexingfilter/makefile.mk
View File

@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
DYNAMIC_CRT=
NO_DEFAULT_STL=TRUE
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/javafilter/makefile.mk
View File

@ -39,7 +39,6 @@ TARGET=jfregca
NO_DEFAULT_STL=TRUE
ENABLE_EXCEPTIONS=TRUE
DYNAMIC_CRT=
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/languagepacks/makefile.mk
View File

@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/patch/makefile.mk
View File

@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/quickstarter/makefile.mk
View File

@ -42,7 +42,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/regactivex/makefile.mk
View File

@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

6
setup_native/source/win32/customactions/regpatchactivex/makefile.mk
View File

@ -55,7 +55,11 @@ INCPRE+=.\Include
SLOFILES = $(SLO)$/regpatchactivex.obj
.IF "$(COM)"=="GCC"
SHL1STDLIBS= -lmingw32 -lstdc++ -lgcc -lmsvcrt
SHL1STDLIBS += -lstdc++
.IF "$(MINGW_GCCLIB_EH)"=="YES"
SHL1STDLIBS += -lgcc_eh
.ENDIF
SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
.ELSE
SHL1STDLIBS=
.ENDIF

1
setup_native/source/win32/customactions/relnotes/makefile.mk
View File

@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/shellextensions/makefile.mk
View File

@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk

1
setup_native/source/win32/customactions/tools/makefile.mk
View File

@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
NO_DEFAULT_STL=TRUE
DYNAMIC_CRT=
USE_DEFFILE=TRUE
MINGW_NODLL=YES
.INCLUDE : settings.mk