diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-19 01:23:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-19 02:55:11 +0200 |
| commit | 79d0853239b7b8bd4fa2de5d8e1917343b27f8d1 (patch) | |
| tree | 285510957a1177a380d498276f04a6907e26b14e /unotest | |
| parent | a738b25f7caff2a5ed789668e1ab0bf29bf5082f (diff) | |
Do build the unoexceptionprotector also when cross-compiling
Diffstat (limited to 'unotest')
| -rw-r--r-- | unotest/prj/d.lst | 1 | ||||
| -rw-r--r-- | unotest/source/cpp/unoexceptionprotector/makefile.mk | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/unotest/prj/d.lst b/unotest/prj/d.lst index a173c2f042ab..7b849242f1be 100644 --- a/unotest/prj/d.lst +++ b/unotest/prj/d.lst @@ -8,6 +8,7 @@ mkdir: %_DEST%\inc\unotest\detail ..\%__SRC%\lib\libunotest.dll.a %_DEST%\lib\libunotest.dll.a ..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib ..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so +..\%__SRC%\lib\libunoexceptionprotector.so %_DEST%\lib\libunoexceptionprotector.so ..\inc\unotest\detail\unotestdllapi.hxx %_DEST%\inc\unotest\detail\unotestdllapi.hxx ..\inc\unotest\bootstrapfixturebase.hxx %_DEST%\inc\unotest\bootstrapfixturebase.hxx ..\inc\unotest\filters-test.hxx %_DEST%\inc\unotest\filters-test.hxx diff --git a/unotest/source/cpp/unoexceptionprotector/makefile.mk b/unotest/source/cpp/unoexceptionprotector/makefile.mk index d3d13e646232..e20438e92e32 100644 --- a/unotest/source/cpp/unoexceptionprotector/makefile.mk +++ b/unotest/source/cpp/unoexceptionprotector/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 -------------------------------------------------------- DLLPRE = @@ -52,7 +47,7 @@ SHL1STDLIBS = \ $(CPPULIB) \ $(CPPUNITLIB) \ $(SALLIB) -SHL1TARGET = unoexceptionprotector +SHL1TARGET = $(ENFORCEDSHLPREFIX)unoexceptionprotector SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) |