[Libreoffice-commits] .: 2 commits - fpicker/source ucb/prj ucb/source

[Tor Lillqvist]

 fpicker/source/win32/filepicker/workbench/makefile.mk   |    2 ++
 fpicker/source/win32/folderpicker/MtaFop.cxx            |    2 +-
 fpicker/source/win32/folderpicker/MtaFop.hxx            |    2 +-
 fpicker/source/win32/folderpicker/makefile.mk           |    2 ++
 fpicker/source/win32/folderpicker/workbench/makefile.mk |    2 ++
 ucb/prj/d.lst                                           |    4 +++-
 ucb/source/ucp/odma/makefile.mk                         |    7 +++----
 7 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 2e82a7c3d18168237efc5c414341223fc0d698ca
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jul 20 20:21:59 2011 +0300

    Fix MinGW compilation errors

diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/filepicker/workbench/makefile.mk
index 926e2c2..80ef330 100644
--- a/fpicker/source/win32/filepicker/workbench/makefile.mk
+++ b/fpicker/source/win32/filepicker/workbench/makefile.mk
@@ -36,7 +36,9 @@ TARGETTYPE=CUI
 
 .INCLUDE :  settings.mk
 
+.IF "$(COM)" == "MSC"
 CFLAGS+=-GR -GX
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 3c4f517..7d744b5 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -34,7 +34,7 @@
 #include "MtaFop.hxx"
 #include <wchar.h>
 #include <process.h>
-#include "..\misc\resourceprovider.hxx"
+#include "../misc/resourceprovider.hxx"
 
 #include <systools/win32/comtools.hxx>
 
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index df7fd4d..9c88d48 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -46,7 +46,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 
 //----------------------------------------------------------------
 // a simple helper class used to provide a buffer for different
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk
index f42ff96..cc7bf18 100644
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ b/fpicker/source/win32/folderpicker/makefile.mk
@@ -38,7 +38,9 @@ COMP1TYPELIST=$(TARGET)
 # --- Files --------------------------------------------------------
 
 # enable rtti
+.IF "$(COM)" == "MSC"
 CFLAGS+=-GR
+.ENDIF
 
 SLOFILES=$(SLO)$/fopentry.obj\
          $(SLO)$/folderpicker.obj\
diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk
index 666751f..8429e2d 100644
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk
@@ -36,7 +36,9 @@ TARGETTYPE=		CUI
 
 .INCLUDE :  settings.mk
 
+.IF "$(COM)" == "MSC"
 CFLAGS+=-GR -EHa
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
commit d392408265e501b1b6543d5429fab4557140123b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jul 20 20:19:48 2011 +0300

    Fix build of our odma_lib library with MinGW

diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 149f4bf..db5b290 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -24,7 +24,9 @@
 ..\%__SRC%\misc\ucp*.map %_DEST%\bin\ucp*.map
 ..\%__SRC%\misc\ucp*.sym %_DEST%\bin\ucp*.sym
 
-..\%__SRC%\slb\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\%__SRC%\lib\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\%__SRC%\lib\libodma_lib.a %_DEST%\lib\libodma_lib.a
+
 ..\source\ucp\odma\odma.h %_DEST%\inc\odma.h
 ..\source\ucp\odma\odma_lib.hxx %_DEST%\inc\odma_lib.hxx
 
diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
index 4af8c76..302cf19 100644
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
@@ -93,10 +93,9 @@ DEF2DES=UCB ODMA URL converter
 
 # --- odma_lib library -----------------------------------------------
 
-SLO3FILES=$(SLO)$/odma_lib.obj
-
-LIB3TARGET=$(SLB)$/odma_lib.lib
-LIB3OBJFILES=$(SLO3FILES)
+LIB3TARGET=$(LB)/odma_lib.lib
+LIB3ARCHIV=$(LB)/libodma_lib.a
+LIB3OBJFILES=$(OBJ)$/odma_lib.obj
 
 # --- Targets ----------------------------------------------------------