summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-14 22:13:34 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-14 22:13:34 +0200
commit57fe22bc06254271affd61fb48b0b229be7a5a2e (patch)
tree92931563f2f203a20c716e39ee4a468c1a6013c2
parent5e05fe52638f60320381f0734e46e907abe16ed0 (diff)
Further firebird-sdbc windows build fixes.
Change-Id: I9cb0bbd45b19cb9ef6aa4b8f6d0538484060c6a0
-rw-r--r--connectivity/Library_firebird_sdbc.mk1
-rw-r--r--scp2/source/base/module_base.scp4
2 files changed, 1 insertions, 4 deletions
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index b05870ff21d1..bada0a848796 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 fbc2bb1bb4fc..b2bfe4a5cf28 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;