applied patch 419155 (OLE x-compilation with mingw)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 4a1c44411f292a1262400d9db99bdf531580e98e..fedf1bba6abb4e4882cdac1bf761f834b71a9c57 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,7 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/ole
+VP12 = @top_srcdir@/src/msw/ole
 
 FTVP01 = @top_srcdir@/src/freetype/unix
 FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -337,7 +337,15 @@ IODBCOBJS = \
                misc.o \
                prepare.o \
                result.o
-        
+
+OLEOBJS = \
+               automtn.o \
+               dataobj.o \
+               dropsrc.o \
+               droptgt.o \
+               oleutils.o \
+               uuid.o
+  
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@

diff --git a/src/make.env.in b/src/make.env.in
index bff33e5385fc3614048a23ddf7295dfa17ce69d1..ebc11291262e3641a03d611334cdea3665ec1103 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -70,8 +70,8 @@ DLLTOOL     = @DLLTOOL@
 # We *must* include CPPFLAGS in both of these, to make sure that all
 # header files get found.  (KB)
 
-CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
-CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
+CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS@
+CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS_CXX@
 PICFLAGS = @PIC_FLAG@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it