[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc3' - connectivity/Library_firebird_sdbc.mk scp2/source

[Andrzej J.R. Hunt]

 connectivity/Library_firebird_sdbc.mk |    1 +
 scp2/source/base/module_base.scp      |    4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 57fe22bc06254271affd61fb48b0b229be7a5a2e
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Sun Jul 14 22:13:34 2013 +0200

    Further firebird-sdbc windows build fixes.
    
    Change-Id: I9cb0bbd45b19cb9ef6aa4b8f6d0538484060c6a0

diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index b05870f..bada0a8 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,firebird_sdbc))
 $(eval $(call gb_Library_use_sdk_api,firebird_sdbc))
 
 $(eval $(call gb_Library_use_externals,firebird_sdbc,\
+	boost_headers \
 	libfbembed \
 ))
 
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index fbc2bb1..b2bfe4a 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -39,16 +39,12 @@ Module gid_Module_Prg_Base_Bin
         gid_File_Share_Registry_Base_Xcd
 /* This should be conditional, but the condition is not working!! */
 /* #if defined ENABLE_FIREBIRD_SDBC */
-        ,gid_File_Lib_FirebirdSdbc
         ,gid_File_FirebirdSdbc_Rdb
         ,gid_File_FirebirdSdbc_Xcd
 /* #endif */
     );
 End
 
-/* This could be moved to a std location */
-STD_LIB_FILE(gid_File_Lib_FirebirdSdbc, firebird_sdbc)
-
 File gid_File_FirebirdSdbc_Rdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program_Services;