diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-12 22:38:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-12 22:38:26 +0000 |
| commit | 4b4baa95ee85d80b67f4f3e12306444604b1ba83 (patch) | |
| tree | 41906e5aa703638e089d3582e5d0f9235ab1aa3f /embedserv | |
| parent | 4d5f48261746f2e027e7670b7698d7fcabda098d (diff) | |
CWS-TOOLING: integrate CWS mingwport17
2009-02-02 09:09:07 +0100 tono r267246 : i#98723#: Less conditionals in libs.mk for mingw
2009-02-02 09:06:03 +0100 tono r267244 : i#98722#: Skip building ldump in mingw
2009-02-02 09:04:05 +0100 tono r267243 : i#98721#: Improve symbol extraction in mingw
2009-02-02 09:02:07 +0100 tono r267242 : i#98720#: Improve strip performance in mingw
2009-02-02 08:59:36 +0100 tono r267241 : i#98719#: Copy mingw multithread runtime in external
2009-02-02 08:55:09 +0100 tono r267240 : i#98718#: Cleanup cygwin workaround for mingw
2009-02-02 08:53:33 +0100 tono r267239 : i#98718#: Cleanup cygwin workaround for mingw
2009-02-02 08:50:36 +0100 tono r267237 : i#98717#: Avoid MSVC version check in mingw configure
2009-01-28 22:28:53 +0100 tono r267088 : i#97608#: Remove Guiddef.h inclusion
2009-01-28 22:24:23 +0100 tono r267087 : i#96980#: cairo dll name is different in mingw build
2009-01-28 22:19:19 +0100 tono r267086 : i#96731#: MinGW port fro embedserv update
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/inprocserv/dllentry.cxx | 3 | ||||
| -rw-r--r-- | embedserv/source/inprocserv/makefile.mk | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 2ab1d0d5bfad..1da88444e841 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -35,6 +35,9 @@ #include <stdio.h> #include <inprocembobj.h> +#ifdef __MINGW32__ +#define INITGUID +#endif #include <embservconst.h> static const GUID* guidList[ SUPPORTED_FACTORIES_NUM ] = { diff --git a/embedserv/source/inprocserv/makefile.mk b/embedserv/source/inprocserv/makefile.mk index 9c90caaae957..ca49d2f0210f 100644 --- a/embedserv/source/inprocserv/makefile.mk +++ b/embedserv/source/inprocserv/makefile.mk @@ -56,10 +56,10 @@ SLOFILES=\ SHL1TARGET=$(TARGET) SHL1STDLIBS=\ - uuid.lib\ - ole32.lib\ - gdi32.lib\ - advapi32.lib + $(UUIDLIB)\ + $(OLE32LIB)\ + $(GDI32LIB)\ + $(ADVAPI32LIB) SHL1OBJS=$(SLOFILES) |