Kaydet (Commit) c8b7e982 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Let's use static archive instead of shared object for liborcus.

Change-Id: I5e33dac1025b1b3e5f49baf67c80da37d8e2ca5d
üst 0df51f70
...@@ -1869,10 +1869,13 @@ endef ...@@ -1869,10 +1869,13 @@ endef
else # !SYSTEM_LIBORCUS 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),\ define gb_LinkTarget__use_orcus
-lorcus-0.2 \ $(call gb_LinkTarget_use_static_libraries,$(1),\
orcus-0.2 \
) )
endef endef
......
...@@ -33,7 +33,7 @@ TARGET=orcus ...@@ -33,7 +33,7 @@ TARGET=orcus
.ENDIF .ENDIF
TARFILE_NAME=liborcus_0.1.0 TARFILE_NAME=liborcus_0.1.0
TARFILE_MD5=3c9d8bd223637b9bca77bcf90d4366aa TARFILE_MD5=870f887bad82663146676017671efb60
PATCH_FILES= PATCH_FILES=
......
...@@ -4,7 +4,6 @@ mkdir: %_DEST%\inc\orcus\spreadsheet ...@@ -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\*.hpp %_DEST%\inc\orcus\
..\%__SRC%\misc\build\liborcus*\include\orcus\spreadsheet\*.hpp %_DEST%\inc\orcus\spreadsheet\ ..\%__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\ ..\%__SRC%\misc\build\liborcus*\src\liborcus\.libs\liborcus-0.2.a %_DEST%\lib\
symlink: %_DEST%\lib\liborcus-0.2.so.0 %_DEST%\lib\liborcus-0.2.so
..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
...@@ -1882,21 +1882,3 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno ) ...@@ -1882,21 +1882,3 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
STD_LIB_FILE( gid_File_Lib_Tubes , tubes) STD_LIB_FILE( gid_File_Lib_Tubes , tubes)
#endif #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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment