diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 12:38:28 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 16:44:26 +0200 |
| commit | 23e5debcc528132eedd7f1530216fe2b2158386a (patch) | |
| tree | ae98d05baa558dbae0313e789f9d7dbdc1b9584a /scp2 | |
| parent | 52af0b0fee71a3002d28cd962deb30dd8cf194f6 (diff) | |
scp2: let's autoinstall libraries with names as gbuild knows them
Change-Id: I01ab0db1a46ed58403ba16247c131550f9b3fcb1
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstallLibs_ooo.mk | 2 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk index d65a6fc1f9bc..46ae5a5c6cab 100644 --- a/scp2/AutoInstallLibs_ooo.mk +++ b/scp2/AutoInstallLibs_ooo.mk @@ -7,6 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,STD_LIB_FILE(auto_File_Lib_$$(1),$$(1)))) +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE(auto_File_Lib_$$(1),$$(call gb_Library_get_runtime_filename,$$(1))))) # vim: set noet sw=4 ts=4: diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 9435fab03aa3..dd8b518da8dc 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -98,6 +98,12 @@ Styles = (PACKED); \ Dir = SCP2_OOO_BIN_DIR +#define LIBO_LIB_FILE(id,name) \ + File id \ + Name = name; \ + PACKED_LIB_FILE_BODY; \ + End + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ |