[Libreoffice-commits] .: 2 commits - fpicker/source fpicker/util

[Tor Lillqvist]

 fpicker/source/win32/folderpicker/FolderPicker.cxx |    2 +-
 fpicker/source/win32/folderpicker/Fopentry.cxx     |    2 +-
 fpicker/source/win32/folderpicker/makefile.mk      |    6 +++---
 fpicker/util/makefile.mk                           |    6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit de7d10126c94cee24826ca531674e7eab61fa218
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jul 20 22:54:28 2011 +0300

    More header name case fixes for MinGW cross-compilation

diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index cae36a0..7aed690 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -34,7 +34,7 @@
 //------------------------------------------------------------------------
 #include <osl/diagnose.h>
 
-#include "folderpicker.hxx"
+#include "FolderPicker.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include "WinFOPImpl.hxx"
 
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 87aedb3..c3670fe 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/container/XSet.hpp>
 #include <osl/diagnose.h>
 
-#include "folderpicker.hxx"
+#include "FolderPicker.hxx"
 
 #include "FOPServiceInfo.hxx"
 #include "WinFOPImpl.hxx"
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk
index cc7bf18..68c0e5c 100644
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ b/fpicker/source/win32/folderpicker/makefile.mk
@@ -42,9 +42,9 @@ COMP1TYPELIST=$(TARGET)
 CFLAGS+=-GR
 .ENDIF
 
-SLOFILES=$(SLO)$/fopentry.obj\
-         $(SLO)$/folderpicker.obj\
-         $(SLO)$/WinFopImpl.obj\
+SLOFILES=$(SLO)$/Fopentry.obj\
+         $(SLO)$/FolderPicker.obj\
+         $(SLO)$/WinFOPImpl.obj\
          $(SLO)$/MtaFop.obj
 
 # --- Targets ------------------------------------------------------
commit d3c7ed8d97b3032c69f0b6c0bd18d7b1dcde574c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jul 20 22:53:41 2011 +0300

    Use delay loading only with MSC

diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index 39fb318..7d42971 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -58,9 +58,13 @@ SHL1STDLIBS=		$(COMMON_LIBS) \
             $(OLEAUT32LIB)\
             $(COMDLG32LIB)\
             $(KERNEL32LIB)\
-            $(UUIDLIB)\
+            $(UUIDLIB)
+
+.IF "$(COM)" == "MSC"
+SHL1STDLIBS+=\
             Delayimp.lib\
             /DELAYLOAD:shell32.dll
+.ENDIF
 
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)