diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-05 13:32:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-05 14:35:51 +0200 |
| commit | f7bfe52ae5cc12ce8198cb01837c875955ac4a6a (patch) | |
| tree | 0455fcdacbbfb35d1d84ed37f9f8a36974ef568e /shell | |
| parent | 2ba5fe6952c8b5aaf81b13a037854becd31c9a9c (diff) | |
shell: no need to define XML_UNICODE ...
... because it is added automatically by the external expat_utf16.
Change-Id: Ifdad11b275f7074be6f2e92df2e3c30c7097a5b7
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt.mk | 1 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common_x64.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_xmlparser.mk | 4 | ||||
| -rw-r--r-- | shell/StaticLibrary_xmlparser_x64.mk | 4 |
10 files changed, 0 insertions, 16 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 2607fea33401..8688d7ca8cfe 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 f0232ba75e82..9c3cb655758d 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 82e7db10a4ce..18af60fb676a 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 46cfd15909e8..f12ba0c29af6 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 9118f08f5018..7881f5f33dce 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 aa6ff0462480..e5deaa9cc46e 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 057b80922fe0..65a0725860ea 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 5665e4b5c9aa..175f8ee7b738 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 eeefe1df5e20..c86bb75937fb 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 845c31e63928..2f5f510bdd94 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 \ )) |