shell/Library_ooofilt.mk | 1 - shell/Library_ooofilt_x64.mk | 1 - shell/Library_propertyhdl.mk | 1 - shell/Library_propertyhdl_x64.mk | 1 - shell/Library_shlxthdl.mk | 1 - shell/Library_shlxthdl_x64.mk | 1 - shell/StaticLibrary_shlxthandler_common.mk | 1 - shell/StaticLibrary_shlxthandler_common_x64.mk | 1 - shell/StaticLibrary_xmlparser.mk | 4 ---- shell/StaticLibrary_xmlparser_x64.mk | 4 ---- 10 files changed, 16 deletions(-)
New commits: commit f7bfe52ae5cc12ce8198cb01837c875955ac4a6a Author: Michael Stahl <[email protected]> Date: Fri Oct 5 13:32:03 2012 +0200 shell: no need to define XML_UNICODE ... ... because it is added automatically by the external expat_utf16. Change-Id: Ifdad11b275f7074be6f2e92df2e3c30c7097a5b7 diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 2607fea..8688d7c 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ )) diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index f0232ba..9c3cb65 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 82e7db1..18af60f 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 46cfd15..f12ba0c 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index 9118f08..7881f5f 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index aa6ff04..e5deaa9 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk index 057b809..65a0725 100644 --- a/shell/StaticLibrary_shlxthandler_common.mk +++ b/shell/StaticLibrary_shlxthandler_common.mk @@ -36,7 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ )) diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 5665e4b..175f8ee 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ )) diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk index eeefe1d..c86bb75 100644 --- a/shell/StaticLibrary_xmlparser.mk +++ b/shell/StaticLibrary_xmlparser.mk @@ -33,10 +33,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\ - -DXML_UNICODE \ -)) - $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ expat_utf16 \ )) diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 845c31e..2f5f510 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -34,10 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser_x64,\ - -DXML_UNICODE \ -)) - $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ expat_utf16 \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
