Kaydet (Commit) f7bfe52a authored tarafından Michael Stahl's avatar Michael Stahl

shell: no need to define XML_UNICODE ...

... because it is added automatically by the external expat_utf16.

Change-Id: Ifdad11b275f7074be6f2e92df2e3c30c7097a5b7
üst 2ba5fe69
...@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\ ...@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
)) ))
......
...@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ ...@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
......
...@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\ ...@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
......
...@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ ...@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
......
...@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\ ...@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
......
...@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ ...@@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
......
...@@ -36,7 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ ...@@ -36,7 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
)) ))
......
...@@ -42,7 +42,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ ...@@ -42,7 +42,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-DXML_UNICODE \
-D_NTSDK \ -D_NTSDK \
-D_UNICODE \ -D_UNICODE \
)) ))
......
...@@ -33,10 +33,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\ ...@@ -33,10 +33,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\
)) ))
ifeq ($(GUI),WNT) ifeq ($(GUI),WNT)
$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\
-DXML_UNICODE \
))
$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\
expat_utf16 \ expat_utf16 \
)) ))
......
...@@ -34,10 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ ...@@ -34,10 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser_x64,\
-DXML_UNICODE \
))
$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\
expat_utf16 \ expat_utf16 \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment