initial creation invisible

[wxWidgets.git] / build / msw / makefile.gcc

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index b8c6dd89f5d1b3623feabb7aafe54973dbfa44fd..dbf35611c70af55f10723acacd1cf27159ac6cde 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -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: ###
 
@@ -862,7 +866,7 @@ ifeq ($(WXUNIV),1)
 __SETUP_H_SUBDIR_FILENAMES = univ
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
@@ -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)
@@ -9523,7 +9539,7 @@ endif
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname)
        $(CXX) -shared -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
 endif
 endif