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

applied patch 419155 (OLE x-compilation with mingw)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-26 16:17:14 +00:00
parent 1216f52d92
commit 7d88e2447e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.in
View File

@@ -42,7 +42,7 @@ VP8 = @top_srcdir@/src/jpeg
VP9 = @top_srcdir@/src/tiff VP9 = @top_srcdir@/src/tiff
VP10 = @top_srcdir@/src/zlib VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc VP11 = @top_srcdir@/src/iodbc
VP12 = @top_srcdir@/src/ole VP12 = @top_srcdir@/src/msw/ole
FTVP01 = @top_srcdir@/src/freetype/unix FTVP01 = @top_srcdir@/src/freetype/unix
FTVP02 = @top_srcdir@/src/freetype/autohint FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -337,7 +337,15 @@ IODBCOBJS = \
misc.o \ misc.o \
prepare.o \ prepare.o \
result.o result.o
OLEOBJS = \
automtn.o \
dataobj.o \
dropsrc.o \
droptgt.o \
oleutils.o \
uuid.o
############################## Rules ################################## ############################## Rules ##################################
BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@

4
src/make.env.in
View File

@@ -70,8 +70,8 @@ DLLTOOL = @DLLTOOL@
# We *must* include CPPFLAGS in both of these, to make sure that all # We *must* include CPPFLAGS in both of these, to make sure that all
# header files get found. (KB) # header files get found. (KB)
CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @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@ CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS_CXX@
PICFLAGS = @PIC_FLAG@ PICFLAGS = @PIC_FLAG@
# taking into account how SHARED_LD is defined, appending LDFLAGS to it # taking into account how SHARED_LD is defined, appending LDFLAGS to it