[Libreoffice-commits] .: Branch 'feature/gbuild_shell' - 3 commits - shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_recentfile.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/StaticLibrary_shlxthandler_common.mk shell/StaticLibrary_shlxthandler_common_x64.mk shell/StaticLibrary_xmlparser.mk

David Tardon dtardon at kemper.freedesktop.org
Tue May 1 07:56:07 PDT 2012 

 shell/Library_ooofilt.mk                       |    5 ++++-
 shell/Library_ooofilt_x64.mk                   |    4 +++-
 shell/Library_propertyhdl.mk                   |    3 ++-
 shell/Library_propertyhdl_x64.mk               |    3 ++-
 shell/Library_recentfile.mk                    |    2 +-
 shell/Library_shlxthdl.mk                      |    3 ++-
 shell/Library_shlxthdl_x64.mk                  |    3 ++-
 shell/StaticLibrary_shlxthandler_common.mk     |    5 +++++
 shell/StaticLibrary_shlxthandler_common_x64.mk |    5 +++++
 shell/StaticLibrary_xmlparser.mk               |    8 ++++++++
 10 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit 04a7fd79cd7499182a80c4977b4eb2dc01c35cc9
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 1 16:49:41 2012 +0200

    clean up expat confusion
    
    Change-Id: I41d1d59b9e1ebad0f292fbd2f8560b150d4a9c3a

diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 2d8528f..0abdd9b 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt,\
-	expat_utf8 \
+	expat_utf16 \
 	zlib \
 ))
 
@@ -78,6 +78,7 @@ endif
 endif
 
 $(eval $(call gb_Library_use_static_libraries,ooofilt,\
+	shell_xmlparser \
 	shlxthandler_common \
 ))
 
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 745fc6e..270abfd 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt_x64,\
-	expat_utf8 \
+	expat_utf16 \
 	zlib \
 ))
 
@@ -73,6 +73,7 @@ $(eval $(call gb_Library_use_libraries,ooofilt_x64,\
 ))
 
 $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
+	shell_xmlparser_x64 \
 	shlxthandler_common_x64 \
 ))
 
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 643699c..c44786d 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl,\
-	expat_utf8 \
+	expat_utf16 \
 	zlib \
 ))
 
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 19bac4c..847a859 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
-	expat_utf8 \
+	expat_utf16 \
 	zlib \
 ))
 
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 60c6d5b..134847d 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,recentfile,\
 ))
 
 $(eval $(call gb_Library_use_externals,recentfile,\
-	expat_utf8 \
+	expat_utf16 \
 ))
 
 $(eval $(call gb_Library_use_libraries,recentfile,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 4deac08..562bbf3 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl,\
-	expat_utf8 \
+	expat_utf16 \
 	zlib \
 ))
 
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index acccc69..2affe1e 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
-	expat_utf8 \
+	expat_utf16 \
 	zlib \
 ))
 
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index 812e4da..186c1f9 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -48,9 +48,14 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
+	expat_utf16 \
 	zlib \
 ))
 
+$(eval $(call gb_StaticLibrary_add_libs,shlxthandler_common,\
+	shell_xmlparser \
+))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common,\
     shell/source/win32/ooofilereader/autostyletag \
     shell/source/win32/ooofilereader/basereader \
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 592cc13..634b977 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -50,9 +50,14 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
+	expat_utf16 \
 	zlib \
 ))
 
+$(eval $(call gb_StaticLibrary_add_libs,shlxthandler_common,\
+	shell_xmlparser_x64 \
+))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common_x64,\
     CustomTarget/shell/source/win32/ooofilereader/autostyletag \
     CustomTarget/shell/source/win32/ooofilereader/basereader \
diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk
index 3136421..f99ab71 100644
--- a/shell/StaticLibrary_xmlparser.mk
+++ b/shell/StaticLibrary_xmlparser.mk
@@ -32,6 +32,14 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\
+	-DXML_UNICODE \
+))
+
+$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\
+	expat_utf16 \
+))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\
     shell/source/all/xml_parser \
 ))
commit ae243d8b7227042f9e2a4f91b95a7194bad31e3e
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 1 15:43:56 2012 +0200

    add missing lib
    
    Change-Id: I4a78872aa39f242452b8b5558349000a1f92cc1f

diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 067016f..2d8528f 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\
 	advapi32 \
 	comctl32 \
 	kernel32 \
+	ole32 \
 	shell32 \
 	uuid \
 	$(gb_Library_win32_OLDNAMES) \
commit 857411a15710afe7af4eed530add26d1ee00836d
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 1 14:29:18 2012 +0200

    fix gdiplus.h bustage
    
    Change-Id: Ief2b37327d2776b1fcb3bd6dd8328e662016978b

diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 0300af9..067016f 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
 	-D_WIN32_IE=0x501 \
 	-U_WIN32_WINNT \
 	-D_WIN32_WINNT=0x0501 \
+	-UNOMINMAX \
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt,\
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index f2ce325..745fc6e 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 	-DXML_UNICODE \
 	-D_NTSDK \
 	-D_UNICODE \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 	-U_WIN32_IE \
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index c77c264..643699c 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
 	-DXML_UNICODE \
 	-D_NTSDK \
 	-D_UNICODE \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_defs,propertyhdl,\
 	-U_WIN32_IE \
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 50eabea..19bac4c 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 	-DXML_UNICODE \
 	-D_NTSDK \
 	-D_UNICODE \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 	-U_WIN32_IE \
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 0fde763..4deac08 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
 	-DXML_UNICODE \
 	-D_NTSDK \
 	-D_UNICODE \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_defs,shlxthdl,\
 	-U_WIN32_IE \
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index eb75e89..acccc69 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 	-DXML_UNICODE \
 	-D_NTSDK \
 	-D_UNICODE \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 	-U_WIN32_IE \

More information about the Libreoffice-commits mailing list