diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-26 17:43:42 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-26 17:46:05 +0200 |
| commit | a953cae319ce4e09626a6f0aae8f84fbb1dc6cf1 (patch) | |
| tree | 5aa26008d40d97d48af6d8630822b398aa59153c /test | |
| parent | 44ff5f147760bf48b22c14c4dcd7512fb9f8075f (diff) | |
One step closer to a functional 'make dev-install' with MinGW.
Diffstat (limited to 'test')
| -rw-r--r-- | test/prj/d.lst | 1 | ||||
| -rw-r--r-- | test/source/cpp/makefile.mk | 9 |
2 files changed, 5 insertions, 5 deletions
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 = \ |