diff options
| -rw-r--r-- | RepositoryExternal.mk | 9 | ||||
| -rw-r--r-- | liborcus/makefile.mk | 2 | ||||
| -rw-r--r-- | liborcus/prj/d.lst | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 18 |
4 files changed, 8 insertions, 24 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d7d4a189f95e..7a1289eddcb7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1869,10 +1869,13 @@ endef else # !SYSTEM_LIBORCUS -define gb_LinkTarget__use_orcus +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + orcus-0.2 \ +)) -$(call gb_LinkTarget_add_libs,$(1),\ - -lorcus-0.2 \ +define gb_LinkTarget__use_orcus +$(call gb_LinkTarget_use_static_libraries,$(1),\ + orcus-0.2 \ ) endef diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk index a3b680c2a4ee..e57bb0830ddf 100644 --- a/liborcus/makefile.mk +++ b/liborcus/makefile.mk @@ -33,7 +33,7 @@ TARGET=orcus .ENDIF TARFILE_NAME=liborcus_0.1.0 -TARFILE_MD5=3c9d8bd223637b9bca77bcf90d4366aa +TARFILE_MD5=870f887bad82663146676017671efb60 PATCH_FILES= diff --git a/liborcus/prj/d.lst b/liborcus/prj/d.lst index d49178288722..7c837284a411 100644 --- a/liborcus/prj/d.lst +++ b/liborcus/prj/d.lst @@ -4,7 +4,6 @@ mkdir: %_DEST%\inc\orcus\spreadsheet ..\%__SRC%\misc\build\liborcus*\include\orcus\*.hpp %_DEST%\inc\orcus\ ..\%__SRC%\misc\build\liborcus*\include\orcus\spreadsheet\*.hpp %_DEST%\inc\orcus\spreadsheet\ -..\%__SRC%\misc\build\liborcus*\src\liborcus\.libs\liborcus-0.2.so.0 %_DEST%\lib\ -symlink: %_DEST%\lib\liborcus-0.2.so.0 %_DEST%\lib\liborcus-0.2.so +..\%__SRC%\misc\build\liborcus*\src\liborcus\.libs\liborcus-0.2.a %_DEST%\lib\ ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5207804ecbc6..928174b6169e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1882,21 +1882,3 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno ) STD_LIB_FILE( gid_File_Lib_Tubes , tubes) #endif -#ifndef SYSTEM_LIBORCUS - -File gid_File_Lib_Liborcus - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT3(liborcus-0.2,0,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(liborcus-0.2,UNXSUFFIX,.0)); - #endif - #elif defined(WNT) - Name = "liborcus-0.2.dll"; - #endif -End - -#endif |