Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define XML_STATIC in Expat header instead of Expat projects.

Browse Source 
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:
Vadim Zeitlin
2013-07-07 14:44:56 +00:00
parent a66bf817a6
commit d53c1e7b09
10 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/msw/makefile.gcc
View File

@@ -174,8 +174,8 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_write.o \
$(OBJS)\wxtiff_tif_zip.o
WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -DNDEBUG -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP -DXML_STATIC \
$(CPPFLAGS) $(CFLAGS)
-DHAVE_W32API_H -DNDEBUG -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) \
$(CFLAGS)
WXEXPAT_OBJECTS = \
$(OBJS)\wxexpat_xmlparse.o \
$(OBJS)\wxexpat_xmlrole.o \