X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..716e96df2b2beb65074744a6d833794b1c8a5790:/samples/html/virtual/Makefile.in diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index b153e51578..2e67f68a47 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -13,11 +13,14 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_HTML = @EXTRALIBS_HTML@ 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@ @@ -32,17 +35,21 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib -VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CXXFLAGS) + -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ + $(__virtual_os2_lib_res) \ virtual_virtual.o \ $(__virtual___win32rc) -WX_VERSION = 2.5.0 +WX_VERSION = 2.5.1 ### Conditionally set variables: ### +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -72,8 +79,8 @@ WX_VERSION = 2.5.0 @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) 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 -o virtual Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o virtual$(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_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -90,18 +97,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = $(SETFILE) -a C virtual +@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT) +COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep virtual$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o @COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle +@COND_PLATFORM_OS2_1@__virtual_os2_lib_res = \ +@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res ### Targets: ### -all: virtual $(__virtual_bundle___depname) data +all: virtual$(EXEEXT) $(__virtual_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f virtual + rm -f virtual$(EXEEXT) rm -rf virtual.app data: @@ -121,13 +134,14 @@ install-strip: install uninstall: -virtual: $(VIRTUAL_OBJECTS) $(__virtual___win32rc) - $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) +virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) + $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_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) $(__virtual___mac_rezcmd) $(__virtual___mac_setfilecmd) + $(__virtual___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -virtual.app/Contents: virtual $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p virtual.app/Contents mkdir -p virtual.app/Contents/MacOS mkdir -p virtual.app/Contents/Resources @@ -142,19 +156,19 @@ virtual.app/Contents: virtual $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/ echo -n "APPL????" >virtual.app/Contents/PkgInfo - ln -f virtual virtual.app/Contents/MacOS/virtual + ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc virtual.app/Contents/Resources/virtual.rsrc - ln -f $(top_srcdir)/src/mac/wxmac.icns virtual.app/Contents/Resources/wxmac.icns + ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc virtual.app/Contents/Resources/virtual.rsrc + ln -sf $(top_srcdir)/src/mac/wxmac.icns virtual.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@virtual_bundle: virtual.app/Contents +@COND_PLATFORM_MACOSX_1@virtual_bundle: virtual.app/Contents/PkgInfo virtual_virtual.o: $(srcdir)/virtual.cpp - $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $< virtual_virtual_rc.o: $(srcdir)/virtual.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 + $(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 dependency info, if present: