mention wxTheApp

[wxWidgets.git] / samples / docvwmdi / Makefile.in

diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in
index d8389097896e0a0d22472c9515295f6e26e16811..6e9fc63786034a56605e367d526cafeacc8565d7 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -35,10 +35,11 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 DESTDIR = 
-DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DOCVIEW_OBJECTS =  \
+       $(__docview_os2_lib_res) \
        docview_docview.o \
        docview_doc.o \
        docview_view.o \
@@ -101,6 +102,8 @@ COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__docview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docview___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o
 @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle
+@COND_PLATFORM_OS2_1@__docview_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -140,8 +143,8 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc docview.app/Contents/Resources/docview.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns docview.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc docview.app/Contents/Resources/docview.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns docview.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@docview_bundle: docview.app/Contents/PkgInfo