X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/samples/xrc/Makefile.in?ds=sidebyside diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index af66314142..c6ab7db394 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -35,12 +35,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) XRCDEMO_OBJECTS = \ + $(__xrcdemo_os2_lib_res) \ xrcdemo_xrcdemo.o \ xrcdemo_myframe.o \ xrcdemo_derivdlg.o \ @@ -111,6 +113,8 @@ COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__xrcdemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o @COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle +@COND_PLATFORM_OS2_1@__xrcdemo_os2_lib_res = \ +@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res ### Targets: ### @@ -164,8 +168,8 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc - ln -f $(top_srcdir)/src/mac/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns + ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc + ln -sf $(top_srcdir)/src/mac/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@xrcdemo_bundle: xrcdemo.app/Contents/PkgInfo