One step closer to a functional 'make dev-install' with MinGW.

4 files changed, 11 insertions, 11 deletions

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 2b2c294045e6..e83f839fdbda 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -56,7 +56,7 @@ cpptest : $(SHL1TARGETN)
 TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
 CPPTEST_LIBRARY = $(SHL1TARGETN)
 
-.IF "$(OS)" != "WNT"
+.IF "$(OS)" != "WNT" || "$(CROSS_COMPILING)" == "YES"
 localinstall :
     $(RM) -r $(installationtest_instpath)
     $(MKDIRHIER) $(installationtest_instpath)
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 69e57381da1c..cf88139a3408 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -58,7 +58,7 @@ installationtest_instset = \
     $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
-.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES"
 installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
 .ELSE
 installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation
@@ -94,7 +94,7 @@ my_javaenv = \
 # which is removed after smoketest); can be removed once issue 50885 is fixed;
 # on other platforms, a single installation to solver is created in
 # smoketestoo_native:
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
+.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES"
 OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`)
 $(MISC)/$(TARGET)/installation.flag : $(shell \
         ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip)
@@ -116,7 +116,7 @@ cpptest .PHONY :
         unoexceptionprotector $(CPPTEST_LIBRARY)
 # As a workaround for #i111400#, ignore failure of $(RM):
     $(COMMAND_ECHO)- $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
+.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES"
     $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
 cpptest : $(MISC)/$(TARGET)/installation.flag
 .END
@@ -133,7 +133,7 @@ javatest_% .PHONY : $(JAVATARGET)
         org.junit.runner.JUnitCore \
         $(subst,/,. $(PACKAGE)).$(@:s/javatest_//)
     $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
+.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES"
     $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
 javatest : $(MISC)/$(TARGET)/installation.flag
 .END
@@ -148,7 +148,7 @@ javatest .PHONY : $(JAVATARGET)
         org.junit.runner.JUnitCore \
         $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
     $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
+.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES"
     $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
 javatest : $(MISC)/$(TARGET)/installation.flag
 .END
diff --git a/test/prj/d.lst b/test/prj/d.lst
index 29388bc72de7..24ec21cc4dea 100644
--- a/test/prj/d.lst
+++ b/test/prj/d.lst
@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\test\detail
 ..\%__SRC%\lib\itest.lib %_DEST%\lib\itest.lib
 ..\%__SRC%\lib\libtest.dylib %_DEST%\lib\libtest.dylib
 ..\%__SRC%\lib\libtest.so %_DEST%\lib\libtest.so
+..\%__SRC%\lib\libtest.dll.a %_DEST%\lib\libtest.dll.a
 ..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib
 ..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so
 ..\inc\test\detail\testdllapi.hxx %_DEST%\inc\test\detail\testdllapi.hxx
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 62a6e2c35019..fd0b2bb42bbb 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -32,11 +32,6 @@ VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
 # --- Files --------------------------------------------------------
 CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
 
@@ -49,7 +44,11 @@ SLOFILES = \
     $(SLO)/toabsolutefileurl.obj \
     $(SLO)/uniquepipename.obj
 
+.IF "$(CROSS_COMPILING)" == "YES"
+SHL1IMPLIB = $(SHL1TARGET)
+.ELSE
 SHL1IMPLIB = i$(SHL1TARGET)
+.ENDIF
 SHL1OBJS = $(SLOFILES)
 SHL1RPATH = NONE
 SHL1STDLIBS = \