X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c3a6972f471bd792eb8d812049c68bccd56a2a9..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/samples/xrc/Makefile.in diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index ddfd9d3385..c6ab7db394 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -16,9 +16,11 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_XML = @EXTRALIBS_XML@ HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ +NM = @NM@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ @@ -33,12 +35,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib -WX_VERSION = 2.5.0 +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 \ @@ -79,9 +83,12 @@ XRCDEMO_OBJECTS = \ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ + xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) +COND_MONOLITHIC_0___WXLIB_ADV_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -101,8 +108,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) +COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep xrcdemo$(EXEEXT) ; fi +@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: ### @@ -132,12 +144,13 @@ install-strip: install uninstall: xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) - $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) + $(__xrcdemo___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p xrcdemo.app/Contents mkdir -p xrcdemo.app/Contents/MacOS mkdir -p xrcdemo.app/Contents/Resources @@ -155,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).0.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 @@ -173,7 +186,7 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include # Include dependency info, if present: