Define XML_STATIC in Expat header instead of Expat projects.
This reverts r74444 and defines XML_STATIC unconditionally in Expat sources themselves as we always use the built-in Expat as a static library, so this solution is simpler and more portable. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -187,8 +187,8 @@ WXTIFF_OBJECTS = \
|
||||
$(OBJS)\wxtiff_tif_zip.obj
|
||||
WXEXPAT_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I$(LIBDIRNAME) \
|
||||
-DCOMPILED_FROM_DSP -DXML_STATIC -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 \
|
||||
$(CPPFLAGS) $(CFLAGS)
|
||||
-DCOMPILED_FROM_DSP -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) \
|
||||
$(CFLAGS)
|
||||
WXEXPAT_OBJECTS = \
|
||||
$(OBJS)\wxexpat_xmlparse.obj \
|
||||
$(OBJS)\wxexpat_xmlrole.obj \
|
||||
|
Reference in New Issue
Block a user