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

XTI changes update

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-23 21:10:58 +00:00
parent 0a20646948
commit e24124667e
23 changed files with 818 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build/msw/makefile.gcc
View File

@@ -456,7 +456,8 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_url.o \
$(OBJS)\monodll_gsocket.o \
$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
$(OBJS)\monodll_xml.o
$(OBJS)\monodll_xml.o \
$(OBJS)\monodll_xtixml.o
MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -551,7 +552,8 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_url.o \
$(OBJS)\monolib_gsocket.o \
$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
$(OBJS)\monolib_xml.o
$(OBJS)\monolib_xml.o \
$(OBJS)\monolib_xtixml.o
NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -766,7 +768,8 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
$(CXXFLAGS)
XMLDLL_OBJECTS = \
$(OBJS)\xmldll_dummy.o \
$(OBJS)\xmldll_xml.o
$(OBJS)\xmldll_xml.o \
$(OBJS)\xmldll_xtixml.o
XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -774,7 +777,8 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS)
XMLLIB_OBJECTS = \
$(OBJS)\xmllib_dummy.o \
$(OBJS)\xmllib_xml.o
$(OBJS)\xmllib_xml.o \
$(OBJS)\xmllib_xtixml.o
### Conditionally set variables: ###
@@ -7378,6 +7382,9 @@ $(OBJS)\monodll_xti.o: ../../src/common/xti.cpp
$(OBJS)\monodll_xtistrm.o: ../../src/common/xtistrm.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_zipstrm.o: ../../src/common/zipstrm.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -8942,6 +8949,9 @@ $(OBJS)\monolib_xti.o: ../../src/common/xti.cpp
$(OBJS)\monolib_xtistrm.o: ../../src/common/xtistrm.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_zipstrm.o: ../../src/common/zipstrm.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -9395,12 +9405,18 @@ $(OBJS)\xmldll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $<
$(OBJS)\xmldll_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $<
$(OBJS)\xmllib_dummy.o: ../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $<
$(OBJS)\xmllib_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $<
$(OBJS)\xmllib_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $<
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)