[libgda] GdaBrowser: fixed WIN32 cross compilation issue



commit f8b3576597045f096c28d7016bb03c3748667215
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Aug 19 15:16:43 2009 +0200

    GdaBrowser: fixed WIN32 cross compilation issue

 installers/WindowsWix/make-zip-exe.sh |    6 +++---
 libgda/libgda.symbols                 |   17 +++++++++++++++++
 tools/browser/canvas/Makefile.am      |    5 ++++-
 tools/browser/common/Makefile.am      |    5 +++++
 4 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/installers/WindowsWix/make-zip-exe.sh b/installers/WindowsWix/make-zip-exe.sh
index cd86eef..45c6626 100755
--- a/installers/WindowsWix/make-zip-exe.sh
+++ b/installers/WindowsWix/make-zip-exe.sh
@@ -62,7 +62,7 @@ function add_files_to_zip
 #
 # dependencies DLLs
 #
-files=(charset.dll iconv.dll intl.dll libgio-2.0-0.dll libglib-2.0-0.dll libgmodule-2.0-0.dll libgobject-2.0-0.dll libgthread-2.0-0.dll libxml2.dll zlib1.dll libsoup-2.4-1.dll libgdk_pixbuf-2.0-0.dll libgdk-win32-2.0-0.dll libgtk-win32-2.0-0.dll libatk-1.0-0.dll libpng12-0.dll libpango-1.0-0.dll libpangocairo-1.0-0.dll libpangoft2-1.0-0.dll libpangowin32-1.0-0.dll libcairo-2.dll libfontconfig-1.dll)
+files=(charset.dll iconv.dll intl.dll libgio-2.0-0.dll libglib-2.0-0.dll libgmodule-2.0-0.dll libgobject-2.0-0.dll libgthread-2.0-0.dll libxml2.dll zlib1.dll libsoup-2.4-1.dll libgdk_pixbuf-2.0-0.dll libgdk-win32-2.0-0.dll libgtk-win32-2.0-0.dll libatk-1.0-0.dll libpng12-0.dll libpango-1.0-0.dll libpangocairo-1.0-0.dll libpangoft2-1.0-0.dll libpangowin32-1.0-0.dll libcairo-2.dll libfontconfig-1.dll libgoocanvas-3.dll)
 add_files_to_zip $archive_ext ${depend_path}/gtk bin $files
 
 files=(libdb47.dll msvcp80.dll msvcr80.dll)
@@ -92,7 +92,7 @@ add_files_to_zip $archive $prefix share/libgda-4.0 $files
 files=(gdaui-generic.png)
 add_files_to_zip $archive $prefix share/libgda-4.0/pixmaps $files
 
-files=(gda-browser.png gda-browser-auth.png gda-browser-auth-big.png gda-browser-connected.png gda-browser-connected-big.png gda-browser-non-connected.png gda-browser-non-connected-big.png gda-browser-schema.png gda-browser-table.png gda-control-center.png gda-control-center-newcnc.png gda-browser-bookmark.png gda-browser-column.png)
+files=(gda-browser.png gda-browser-auth.png gda-browser-auth-big.png gda-browser-connected.png gda-browser-connected-big.png gda-browser-non-connected.png gda-browser-non-connected-big.png gda-browser-schema.png gda-browser-table.png gda-control-center.png gda-control-center-newcnc.png gda-browser-bookmark.png gda-browser-column.png gda-browser-diagram.png)
 add_files_to_zip $archive $prefix share/pixmaps $files
 
 files=(gdaui-entry-string-number.xml gdaui-entry-string-string.xml)
@@ -116,7 +116,7 @@ add_files_to_zip $archive_ext . etc/gtk-2.0 $files
 files=(pango.modules)
 add_files_to_zip $archive_ext $prefix etc/pango $files
 
-files=(gda-sql-4.0.exe gda-test-connection-4.0.exe libgda-4.0-4.dll libgda-report-4.0-4.dll libgdaui-4.0-4.dll gda-browser-4.0.exe gda-control-center-4.0.exe gspawn-win32-helper.exe)
+files=(gda-sql-4.0.exe gda-test-connection-4.0.exe libgda-4.0-4.dll libgda-report-4.0-4.dll libgda-ui-4.0-4.dll gda-browser-4.0.exe gda-control-center-4.0.exe gspawn-win32-helper.exe)
 add_files_to_zip $archive $prefix bin $files
 
 files=(gdaui-demo-4.0.exe)
diff --git a/libgda/libgda.symbols b/libgda/libgda.symbols
index f094e77..d8f16a3 100644
--- a/libgda/libgda.symbols
+++ b/libgda/libgda.symbols
@@ -415,6 +415,7 @@
 	gda_meta_store_schema_get_structure
 	gda_meta_store_schema_remove_custom_object
 	gda_meta_store_set_attribute_value
+	gda_meta_store_set_reserved_keywords_func
 	gda_meta_store_sql_identifier_quote
 	gda_meta_struct_add_db_object
 	gda_meta_struct_complement
@@ -561,6 +562,22 @@
 	gda_sql_any_part_check_structure
 	gda_sql_any_part_foreach
 	gda_sql_any_part_type_get_type
+	gda_sql_builder_add_field
+	gda_sql_builder_cond
+	gda_sql_builder_cond_v
+	gda_sql_builder_expr
+	gda_sql_builder_get_statement
+	gda_sql_builder_get_sql_statement
+	gda_sql_builder_get_type
+	gda_sql_builder_join_add_field
+	gda_sql_builder_ident
+	gda_sql_builder_new
+	gda_sql_builder_param
+	gda_sql_builder_select_add_target
+	gda_sql_builder_select_join_targets
+	gda_sql_builder_select_order_by
+	gda_sql_builder_set_table
+	gda_sql_builder_set_where
 	gda_sql_case_copy
 	gda_sql_case_free
 	gda_sql_case_new
diff --git a/tools/browser/canvas/Makefile.am b/tools/browser/canvas/Makefile.am
index 59a2b6f..48dc28c 100644
--- a/tools/browser/canvas/Makefile.am
+++ b/tools/browser/canvas/Makefile.am
@@ -32,6 +32,9 @@ libcanvas_la_SOURCES = \
 	browser-canvas-utility.c \
 	browser-canvas-utility.h
 
-libcanvas_la_LDFLAGS = \
+libcanvas_la_LIBADD = \
+	$(top_builddir)/libgda/libgda-4.0.la \
+	$(LIBGDA_LIBS) \
+	$(GTK_LIBS) \
 	$(GOOCANVAS_LIBS) \
 	$(GRAPHVIZ_LIBS)
diff --git a/tools/browser/common/Makefile.am b/tools/browser/common/Makefile.am
index 3996a3b..d9a39a2 100644
--- a/tools/browser/common/Makefile.am
+++ b/tools/browser/common/Makefile.am
@@ -22,6 +22,11 @@ libcommon_la_SOURCES = \
 
 $(OBJECTS): marshal.c marshal.h
 
+libcommon_la_LIBADD = \
+	$(top_builddir)/libgda/libgda-4.0.la \
+	$(LIBGDA_LIBS) \
+	$(GTK_LIBS)
+
 EXTRA_DIST = \
 	marshal.list
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]