handle VT_ARRAY/VT_BYREF VARIANTs in wxConvertOleToVariant() (patch 1845897)

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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 28715f60e836ea52fe66b3d4b60f61d2bcb15948..9947a93a2224ada501264fa87fff1faeb02a63c2 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -419,6 +419,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_socket.obj \
        $(OBJS)\monodll_url.obj \
        $(OBJS)\monodll_gsocket.obj \
        $(OBJS)\monodll_socket.obj \
        $(OBJS)\monodll_url.obj \
        $(OBJS)\monodll_gsocket.obj \

+       $(OBJS)\monodll_gsockmsw.obj \

        $(OBJS)\monodll_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj \
        $(OBJS)\monodll_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj \


@@ -560,6 +561,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_socket.obj \
        $(OBJS)\monolib_url.obj \
        $(OBJS)\monolib_gsocket.obj \
        $(OBJS)\monolib_socket.obj \
        $(OBJS)\monolib_url.obj \
        $(OBJS)\monolib_gsocket.obj \

+       $(OBJS)\monolib_gsockmsw.obj \

        $(OBJS)\monolib_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \
        $(OBJS)\monolib_urlmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \


@@ -836,6 +838,7 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_socket.obj \
        $(OBJS)\netdll_url.obj \
        $(OBJS)\netdll_gsocket.obj \
        $(OBJS)\netdll_socket.obj \
        $(OBJS)\netdll_url.obj \
        $(OBJS)\netdll_gsocket.obj \

+       $(OBJS)\netdll_gsockmsw.obj \

        $(OBJS)\netdll_urlmsw.obj
 NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        $(OBJS)\netdll_urlmsw.obj
 NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \


@@ -861,6 +864,7 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_socket.obj \
        $(OBJS)\netlib_url.obj \
        $(OBJS)\netlib_gsocket.obj \
        $(OBJS)\netlib_socket.obj \
        $(OBJS)\netlib_url.obj \
        $(OBJS)\netlib_gsocket.obj \

+       $(OBJS)\netlib_gsockmsw.obj \

        $(OBJS)\netlib_urlmsw.obj
 COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        $(OBJS)\netlib_urlmsw.obj
 COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \


@@ -1664,7 +1668,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gdiobj.obj \
        $(OBJS)\monodll_gdiplus.obj \
        $(OBJS)\monodll_graphics.obj \
        $(OBJS)\monodll_gdiobj.obj \
        $(OBJS)\monodll_gdiplus.obj \
        $(OBJS)\monodll_graphics.obj \

-       $(OBJS)\monodll_gsockmsw.obj \

        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \


@@ -1893,7 +1896,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gdiobj.obj \
        $(OBJS)\monodll_gdiplus.obj \
        $(OBJS)\monodll_graphics.obj \
        $(OBJS)\monodll_gdiobj.obj \
        $(OBJS)\monodll_gdiplus.obj \
        $(OBJS)\monodll_graphics.obj \

-       $(OBJS)\monodll_gsockmsw.obj \

        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_imaglist.obj \
        $(OBJS)\monodll_minifram.obj \


@@ -2313,7 +2315,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gdiobj.obj \
        $(OBJS)\monolib_gdiplus.obj \
        $(OBJS)\monolib_graphics.obj \
        $(OBJS)\monolib_gdiobj.obj \
        $(OBJS)\monolib_gdiplus.obj \
        $(OBJS)\monolib_graphics.obj \

-       $(OBJS)\monolib_gsockmsw.obj \

        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \


@@ -2542,7 +2543,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gdiobj.obj \
        $(OBJS)\monolib_gdiplus.obj \
        $(OBJS)\monolib_graphics.obj \
        $(OBJS)\monolib_gdiobj.obj \
        $(OBJS)\monolib_gdiplus.obj \
        $(OBJS)\monolib_graphics.obj \

-       $(OBJS)\monolib_gsockmsw.obj \

        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_imaglist.obj \
        $(OBJS)\monolib_minifram.obj \


@@ -2901,7 +2901,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_gdiobj.obj \
        $(OBJS)\coredll_gdiplus.obj \
        $(OBJS)\coredll_graphics.obj \
        $(OBJS)\coredll_gdiobj.obj \
        $(OBJS)\coredll_gdiplus.obj \
        $(OBJS)\coredll_graphics.obj \

-       $(OBJS)\coredll_gsockmsw.obj \

        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \


@@ -3130,7 +3129,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_gdiobj.obj \
        $(OBJS)\coredll_gdiplus.obj \
        $(OBJS)\coredll_graphics.obj \
        $(OBJS)\coredll_gdiobj.obj \
        $(OBJS)\coredll_gdiplus.obj \
        $(OBJS)\coredll_graphics.obj \

-       $(OBJS)\coredll_gsockmsw.obj \

        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_imaglist.obj \
        $(OBJS)\coredll_minifram.obj \


@@ -3371,7 +3369,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_gdiobj.obj \
        $(OBJS)\corelib_gdiplus.obj \
        $(OBJS)\corelib_graphics.obj \
        $(OBJS)\corelib_gdiobj.obj \
        $(OBJS)\corelib_gdiplus.obj \
        $(OBJS)\corelib_graphics.obj \

-       $(OBJS)\corelib_gsockmsw.obj \

        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \


@@ -3600,7 +3597,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_gdiobj.obj \
        $(OBJS)\corelib_gdiplus.obj \
        $(OBJS)\corelib_graphics.obj \
        $(OBJS)\corelib_gdiobj.obj \
        $(OBJS)\corelib_gdiplus.obj \
        $(OBJS)\corelib_graphics.obj \

-       $(OBJS)\corelib_gsockmsw.obj \

        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_imaglist.obj \
        $(OBJS)\corelib_minifram.obj \


@@ -4495,7 +4491,7 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) clean

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
 
 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
 


@@ -4814,7 +4810,7 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 sub_samples: 
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all
 sub_samples: 
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all

-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"

 
 $(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)


@@ -5835,6 +5831,9 @@ $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
 $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 

+$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+

 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 


@@ -6426,11 +6425,6 @@ $(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 

-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**


@@ -7935,6 +7929,9 @@ $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
 $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 

+$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+

 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 


@@ -8526,11 +8523,6 @@ $(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 

-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**


@@ -10344,6 +10336,9 @@ $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
 $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
 
 $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
 

+$(OBJS)\netdll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
+

 $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
 
 $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
 


@@ -10383,6 +10378,9 @@ $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
 $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
 
 $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
 

+$(OBJS)\netlib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
+

 $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
 
 $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
 


@@ -10680,11 +10678,6 @@ $(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 

-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**


@@ -11991,11 +11984,6 @@ $(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 

-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-

 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**